Change imports to reflect oslo changes.
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone into havana