Merge branch 'feature/liberty' into 'master'

OpenStack Liberty compatability

See merge request !2