Feature/heat havana/release/roxy/master

Changes in order to make Heat work on "havana"+"roxy" Crowbar release.