Merge branch 'feature/liberty' into 'master'

openstack nova configuration for liberty

See merge request !8