clean up haproxy job spec
Merge remote-tracking branch 'origin/pr/540' into develop

Conflicts:
	jobs/haproxy/spec