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 proper tmpdirs for dump and restore.
Fix for Bug 895878

 * rhc app start... failed to un-idle application. Regression from
   https://github.com/openshift/origin-server/commit/6ec9581a05058daeb83edcbb717edf4dff141096
   Reverted here.
 * oo-restorer updated to be more robust
Merge pull request #1156 from rmillner/BZ892036

Merged by openshift-bot
BZ 837489: Scramble the username due to mysql security bug.
Merge pull request #1157 from jwhonce/dev/bz895878

Merged by openshift-bot
Merge pull request #1158 from rmillner/BZ837489

Merged by openshift-bot
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
Fixes Bug 895370
Bug 895269
Replace expose/show/conceal-port hooks with Endpoints

As part of the ongoing effort to implement the new cartridge API, remove the
expose-port, show-port, and conceal-port hooks from the cartridges, and
move their functionality up into the platform via the node library.

Proxy ports are now defined by cart authors via an Endpoints element in the
cartridge manifest YAML, and the platform functionality is implemented
internally within the node library as opposed to being handled ad-hoc in
cartridge hooks.

The show-port and conceal-port hooks are now no-op stubs in the agent
and broker proxy.
Merge pull request #1160 from fabianofranz/master

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

Merged by openshift-bot
dont return nil resultIO