Add Cartridge-Vendor to manifest.yml in v1.

This value is not used in v1, but required for cartridge vendor name
validation.
Add logger lines back.
renaming and fix bug#958970
Fix bug 957262
Merge pull request #2343 from rmillner/BZ958355

Merged by openshift-bot
Merge pull request #2344 from rajatchopra/master

Merged by openshift-bot
Fix bug 951405
Fix for bug 959178
moving templates to usr

moving templates to usr

Conflicts:
	cartridges/openshift-origin-cartridge-ruby/bin/setup
Merge pull request #2342 from BanzaiMan/dev/hasari/c288_followup

Merged by openshift-bot
Merge pull request #2345 from pmorie/bugs/957262

Merged by openshift-bot
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
Remove broken test to fix
Merge pull request #2349 from jwhonce/wip/oo-admin-cartridge

Merged by openshift-bot
Add authorization controller tests in console
Merge pull request #2350 from smarterclayton/add_auth_controller_test

Merged by openshift-bot