Update templates to Icehouse
Merge pull request #78 from dirkmueller/master_heat_conf_update

Update templates to Icehouse