fix the version set in description of a new node js repo
Do not return a unclear error message if json_data is not set

Test with :
   curl -d ''  http://127.0.0.1:8080/broker/cartlist

While this should return a error message, the current code return
a ruby traceback, which is not helpful to understand what is going on.
changed mirror1.stg and prod to mirror1.ops
oo-accept-broker: drop sysctl checks

In oo-accept-broker, we have the check_kernel_settings function which
checks some sysctl settings.  However, we only change these settings on
the node, so these checks do not belong in oo-accept-broker.

The invocation of check_kernel_settings is commented out, so the checks
were never run.  This commit deletes both the commented-out invocation
and the definition of check_kernel_settings.
use awk instead of awk, cat and grep. Just for having more compact code
Added js_required helper
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
Bug 901444
Adding support for broker to mongodb connections over SSL
Merge pull request #1149 from fotioslindiakos/captcha

Merged by openshift-bot
Merge pull request #1168 from danmcp/master

Bug 901444
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].