Fix MakeContext if auth_token middleware is absent.
Add Keystone API echo stubs
Refactor