Explicitly specify ERB files to process in jboss cartridges
Merge pull request #3002 from ironcladlou/migration-fixes

Merged by openshift-bot