This includes most of the remaining changes for ENTESB-2169 to meet JBoss Developer Guidelines