Merge pull request #1920 from cloudedge/master

https://github.com/crowbar/crowbar/pull/1920

Merged by devtool for VictorLowther
renaming quantum
Merge pull request #1922 from MirantisDellCrowbar/feature/neutron/roxy/master

switch to havana and quantum renaming [8/8]