Merge pull request #1 from vuntz/haproxy

Cleanups required before merging
Update constraints so that heat-server role can be assigned to cluster