ENTESB-2169 Most of the changes needed to meet JBoss Developer Guideline...

...s