updated utility classes
fixing compilation errors according to utility classes
Merge branch 'master' of https://github.com/malinthaadikari/esb_test_mig