ENTESB-2169 Most of the changes needed to meet JBoss Developer Guidelines
Merge pull request #51 from jboss-fuse/ENTESB-2124