Updating haproxy to account for 6/17 security fixes
Merge branch 'omniti-ms' of github.com:omniti-labs/omnios-build into omniti-ms, adding updated haproxy