Merge pull request #2131 from ironcladlou/dev/v2carts/jbossbugs

Merged by openshift-bot
Merge pull request #2133 from ironcladlou/dev/v2carts/ruby

Merged by openshift-bot
Merge pull request #2134 from jwhonce/bug/953002

Merged by openshift-bot
Bug 950984: Implement stop_lock for force stop
Merge pull request #2124 from ironcladlou/dev/v2carts/bz950984

Merged by openshift-bot
Bug 949844

Fix the logic in PID detection. If $PID is empty, warn and abort operation.
At the moment PID detection relies on the presence of a process with "Rack:" in it. This may fail if the application had just been started.

Update README on threaddummp command on the v2 Ruby cartridge
Bug 947010: Exclude grep when checking for existing process

Resolve https://bugzilla.redhat.com/show_bug.cgi?id=947010
Adding the ability to detect gear processes missing from cgroups
Merge remote-tracking branch 'origin/master' into separate_config_from_environments
refix unreserve_uid when destroying gear
Bug 952161

Encode XML entities in jenkins_shell_command.rb template after processing ERB directives.
<oo-cart-version> remove online-specifics so works in origin
Merge pull request #2137 from ironcladlou/dev/v2carts/bz/947010

Merged by openshift-bot
<v2 carts> remove abstract cartridge from v2 requires
Fix for bug 953493
 - Providing better error message when creating a scalable application with a framework cartridge that cannot be scaled
 - Validating against adding more than one framework cartridge to an application
Add missing bash SDK function
Add a test case for configuration to ruby values
Bug 953177 - Keys with periods in their name cannot be deleted
Merge pull request #2142 from rajatchopra/master

Merged by openshift-bot
Bug 87442

Avoid confusion arising from app-root/repo/node_modules/read.me implying that read.me file should not be removed when force_clean_build marker is present.

app-root/repo/node_modules/read.me is now removed, and app-root/repo/README.md will point to updated documentation at https://github.com/openshift/origin-server/blob/master/cartridges/openshift-origin-cartridge-nodejs/README.md, which explains the purpose of the node_modules directory.