Backed out some of the changes for ENTESB-2169 since they were breaking the perfectus build
Merge pull request #53 from jboss-fuse/PERFECTUS-054