Merge branch 'feature/liberty' into 'master'

openstack glance liberty configuration

See merge request !13