Merge branch 'feature/liberty' into 'master'

OpenStack Keystone liberty configuration

See merge request !8