Use --insecure in tests
Use --clean to isolate problems, purge the express config
Swap node_steps to use rhc_delete_domain/create_domain for sanity

Conflicts:
	controller/test/cucumber/support/command_helper.rb
Update the description and display name for haproxy-1.4 to reflect its true purpose
Merge branch 'master' of git://github.com/openshift/origin-server into use_nahi_httpclient_instead
Fix for Bug 880699

better regex
BZ901546
Merge pull request #1169 from smarterclayton/use_nahi_httpclient_instead

Merged by openshift-bot
Cleanup init script display + handle "whacked" pids on restarts (stop).
Fix typo in cart data type for environment variables.
Move PHPRC from app_ctl_pre.sh to app_ctl.sh - otherwise its not set/sourced in
for apache (php appserver) running on the haproxy gear.
BZ 901502: Needed to account for username change in dump/restore.
Merge pull request #1171 from jwhonce/dev/bz880699

Merged by openshift-bot
messaging thread pool based on gear size
BZ 901449: An SELinux issue prevents forces this script to use system ruby and not the SCL version.
Fix bugz 894170 - Server timeout with add/remove of Metrics cartridge.
Merge pull request #1176 from rmillner/BZ901502

Merged by openshift-bot
Merge pull request #1172 from bdecoste/master

Merged by openshift-bot
Merge pull request #1177 from rmillner/BZ901449

Merged by openshift-bot
Merge pull request #1178 from ramr/master

Merged by openshift-bot
favor different nodes within a gear group
Merge pull request #1179 from danmcp/master

Merged by openshift-bot