Keystone v3 related commits that were missing
Merge pull request #4 from craiganderson/stable/havana

Keystone v3 related commits that were missing