Fix for bug 959178
moving templates to usr

moving templates to usr

Conflicts:
	cartridges/openshift-origin-cartridge-ruby/bin/setup
Updates to README for managed_files.yml
Merge pull request #2339 from fotioslindiakos/locked_files

Updates to README for managed_files.yml
Merge pull request #2348 from abhgupta/bug_959178

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

Merged by openshift-bot
WIP Cartridge Refactor - Install cartridges without mco client

* Use signal USR1 when mco client not available