Port to Icehouse configs
Merge pull request #219 from dirkmueller/master_icehouse_conf

Port to Icehouse configs