Merge "Non-admin token tests for Keystone API"