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
adding rdoc to mcollective_application_container

about half way through annotating

doced more

only 23 protected methods left

got a few more documented

still more function docs

all methods have comments.  A couple still need fleshing out

finally got a comment on everything.

cleaned up and augmented rdoc comments

more cleanup of rdoc

corrected class name typo

fixed pull request typo comments

change comments on job functions to indicate what they really do

Conflicts:
	plugins/msg-broker/mcollective/lib/openshift/mcollective_application_container_proxy.rb
added add/remove ssl cert methods to ease merge

Conflicts:
	plugins/msg-broker/mcollective/lib/openshift/mcollective_application_container_proxy.rb
Adding support for broker to mongodb connections over SSL
Merge pull request #1098 from markllama/messaging-analysis

Merged by openshift-bot
Merge branch 'master' of git://github.com/openshift/origin-server into use_nahi_httpclient_instead
Merge pull request #1154 from calfonso/master

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-diy-0.1] release [1.3.3-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-1.4] release [1.3.5-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.3.3-1].
Automatic commit of package [openshift-origin-cartridge-ruby-1.9-scl] release [1.3.3-1].
Automatic commit of package [openshift-origin-cartridge-abstract] release [1.3.5-1].
Automatic commit of package [openshift-origin-broker-util] release [1.3.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.3.6-1].
Automatic commit of package [openshift-origin-cartridge-php-5.3] release [1.3.4-1].
Automatic commit of package [openshift-origin-cartridge-ruby-1.8] release [1.3.3-1].
Automatic commit of package [openshift-origin-cartridge-cron-1.4] release [1.3.2-1].
Automatic commit of package [openshift-origin-cartridge-perl-5.10] release [1.3.3-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.3.7-1].