fix bug919379
Bug 876746 - oo-cartridge-info errors when no parameters are passed
correct openshift-node-web-proxy logrotate to match all log files.
Merge pull request #1605 from rajatchopra/master

fix bug919379 - clear-pending-ops marks delete_app op
fix for bug 920045 - connector args should have gear uuid
Bug 920365: Fix oo-create-endpoints to call the correct method.
WIP Cartridge Refactor - Refactor building rhcsh environment

* Add /etc/openshift/env and ~/*/env directories
Merge pull request #1610 from rajatchopra/master

Merged by openshift-bot
Fixing console log file SELinux context and permissions
use restart instead of reload.
Revert "Merge pull request #1604 from jwhonce/wip/cartridge_repository"

This reverts commit bd55353a37835cf107a3ab5e3c33e67afba3ab97, reversing
changes made to 2d3c404dbb3991d3aef2c028e3c143160ef919a0.
Merge pull request #1615 from danmcp/master

Reverting
Merge pull request #1606 from calfonso/master

Bug 876746 - oo-cartridge-info errors when no parameters are passed
Merge pull request #1614 from jwhonce/wip/rhcsh

Merged by openshift-bot
Merge pull request #1613 from mrunalp/bugs/920365

Merged by openshift-bot
Merge pull request #1616 from kraman/fix_console_permissions

Merged by openshift-bot
Merge pull request #1609 from blentz/fix_node_proxy_logrotate

Merged by openshift-bot