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
Merge pull request #1169 from smarterclayton/use_nahi_httpclient_instead

Merged by openshift-bot