First changes for ENTESB-2169, implement changes to meet JBoss Developer...

... Guidelines