Fix bug 999013: always remove unprocessed env/*.erb files from cartridge dir during compatible upgrade
Merge pull request #3440 from pmorie/bugs/999013

Merged by openshift-bot