Merge branch 'master' into samarth
removing redundant methods for converting to/from Cluster and String
removing redundant methods for converting to/from Process and String
removing redundant methods for converting to/from Feed and String
unifying marshalling/unmarshalling code
fixing start date of EmbeddedPigScriptTest and ProcessInstanceRunningTest
unifying usage of Merlin.properties
removing unused envFileName property from IEntityManagerHelper
removing PrismHelper class as it is same as ColoHelper class
removing unused imports
removing unnecessary exceptions
unifying marshalling/unmarshalling code
fixing issues introduced in rebase
test code generates invalid entity xmls hence, disabling schema checking
adding config method to read string array
fixing retention xmls
erased empty lines
time reduces from ~35 min to ~17-18 min
time reduces from ~34 min to ~11 min
time reduces from ~28 min to ~6 min