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
Merge pull request #320 from pisaychuk/master

reduced time of test
overloading waitTillInstanceReachState and increasing wait time of PrismFeedReplicationPartitionExpTest
Merge pull request #315 from raghavgautam/cleanup

Unifying marshalling/unmarshalling code
Merge branch 'master' into samarth

Conflicts:
	merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java