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
Merge pull request #158 from vuntz/roxy-sync

Merge roxy branch into stoney