Merge branch 'CHEF-4346/rabbitmq-port'
Allow postgresql port to be customized in chef-server.rb config

[CHEF-4235]
Update omnibus-software

Pull in updated nginx config with ipv6 support