Bug 1007455 - Added primary_cartridge methods to Ruby SDK
Added OpenShift::Cartridge::Sdk namespace and removed TODO
Bug 980515 - Remove extraneous Conflicts element
Bug 1010435 - /health provided by proxy
Fixing AddCompOp code
Fix for bug 1010632
routing spi changes
Port ssl_to_gear changes to the frontend plugins.
Merge pull request #3680 from jwhonce/bug/980515

Merged by openshift-bot
Merge pull request #3681 from jwhonce/bug/1010435

Merged by openshift-bot
Merge pull request #3683 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #3682 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #3686 from rajatchopra/new_master

Merged by openshift-bot
Merge pull request #3685 from rmillner/ssl_to_gear

Merged by openshift-bot
Card origin_runtime_232 - Unidle application if accessed via node-web-proxy

* Ported code to SCL NodeJS 0.10
* Hold inbound connection until application is un-idled
setup mock cart to serve ssl on port 8443, and to run with oo-ruby
Merge pull request #3688 from jwhonce/wip/idle_websockets

Merged by openshift-bot
Merge pull request #3689 from teddythetwig/mock_serve_ssl

Merged by openshift-bot
RHBZ#1005307 refactor oo-restorecon to accept files as arguments
node-util: extend the oo-restorecon man pages