Merge branch 'master' into release/0.17

Author: pjenvey

tokenserver-auth/src/oauth/verify.py

@@ -16,4 +16,6 @@ def verify_token(self, token):
             # Serialize the data to make it easier to parse in Rust
             return json.dumps(token_data)
         except (ClientError, TrustError):
-            return None
+            # XXX: debugging
+            #return None
+            raise