Add logger lines back.
renaming and fix bug#958970
Merge pull request #2343 from rmillner/BZ958355

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

Merged by openshift-bot
moving templates to usr

moving templates to usr

Conflicts:
	cartridges/openshift-origin-cartridge-ruby/bin/setup