Merge "Added test of default domain in Keystone"