Merge branch 'feature/liberty' into 'master'

openstack heat configuration for release liberty

See merge request !2