Bug 1057558 - reload the haproxy_ctld.rb action hook on git push
Bug 1045972 - Removing whitespace on default MOTD_FILE value

I suspect this is what was causing the bug.  If you merely uncommented that
line it would not work until the extra whitespace was removed.
Bug 1048139 - Adding missing setting to broker.conf
Ignore failures if haproxy_ctld isn't running
Changes for supporting frontend paths in node web proxy.
Bug 1049089 - Speed up selinux labeling usage

* Stop resetting selinux context n-times on same code path
* Stop creating selinux labels when they are not needed
* Expose chcon rather than shelling out to restorecon(1)

Conflicts:
	node/lib/openshift-origin-node/model/v2_cart_model.rb
Merge pull request #4646 from brenton/BZ1045972

Merged by openshift-bot
Bug 1060902: Fix relative venv function during install_setup_tools
Merge pull request #4642 from brenton/BZ1057558

Merged by openshift-bot
Node Platform - Fix tests since performance enhancements
Merge pull request #4650 from mrunalp/dev/wspathnode

Merged by openshift-bot
Merge pull request #4655 from jwhonce/bug/1049089

Merged by openshift-bot
fix frontend fqdn for ha
Merge pull request #4651 from ironcladlou/bz/1060902

Merged by openshift-bot
Merge pull request #4653 from jwhonce/wip/watchman

Merged by openshift-bot
Merge pull request #4654 from rajatchopra/master

Merged by openshift-bot