Update for prepare_role_for_ha_with_haproxy API change
Merge pull request #155 from vuntz/api-change

Update for prepare_role_for_ha_with_haproxy API change
Merge branch 'release/roxy/master' into roxy-sync
Simply replaced havana with icehouse
Merge pull request #159 from tboerger/feature/havana-to-icehouse

Simply replaced havana with icehouse
Merge pull request #158 from vuntz/roxy-sync

Merge roxy branch into stoney
Renamed i18n file, added quotes and copyright
Merge pull request #161 from tboerger/feature/i18n-rename

Renamed i18n file, added quotes and copyright