Fix issues that broke SSO on Pantheon
Merge branch 'master' of github.com:apigee/apigee_drupal_sso