Explicitly specify ERB files to process in jboss cartridges
Bug 960924: Add mysql and pg drivers to template pom.xml
Merge pull request #3003 from ironcladlou/jboss-erb-fixes

Merged by openshift-bot
Merge pull request #3005 from ironcladlou/bz/960924

Merged by openshift-bot