This includes most of the remaining changes for ENTESB-2169 to meet JBoss Developer Guidelines
Merge commit '66b93f4c35e447809a9aa149085fb64f499cbb5a' into ENTESB-2169
Merge pull request #63 from jboss-fuse/ENTESB-2169