Update config templates to Havana release

Rebased version of https://github.com/crowbar/barclamp-cinder/pull/98