BAM-121 - moved helper classes into generic jee module