Merge branch 'release_3.1.1' into stable

* release_3.1.1:
  Filter on reason also when logging in via sso and picking authtoken

awx/sso/views.py

@@ -50,6 +50,7 @@ class CompleteView(BaseRedirectView):
             try:
                 token = AuthToken.objects.filter(user=request.user,
                                                  request_hash=request_hash,
+                                                 reason='',
                                                  expires__gt=now())[0]
                 token.refresh()
                 logger.info(smart_text(u"User {} logged in".format(self.request.user.username)))