Merge branch 'stable-2.11' * stable-2.11: Include '/a' into HttpScheme URLs to trigger authentication Change-Id: I588d47262d67d6b86f430d4a1afcef41bc3ceb7a