Merge "Set Apache bind port to match haproxy listen in horizon.server.cluster"