fixed merge conflict
Merge pull request #781 from shatterednirvana/nginx-haproxy-port-reuse

Properly setting nginx_https port