Card online_runtime_287 - Add cartridge/usr/template locations

* GIT template search locations:
    * ~/<cartridge home>/template
    * ~/<cartridge home>/template.git
    * ~/<cartridge home>/usr/template
    * ~/<cartridge home>/usr/template.git
Missed a step in teardown
Merge pull request #2228 from jwhonce/wip/card287

Merged by openshift-bot