Merge branch 'master' into samarth
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
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
Merge pull request #322 from samarthgupta437/samarth

overloading waitTillInstanceReachState
cleaning up ClusterMerlin
cleaning up FeedMerlin
cleaning up ProcessMerlin
removing a variable from Util.java
making logger variable private
uniforming declaration of loggers throughout the codebase
changing order of parameters
simplified non-recursive implementation for getDataFromFolder() method
moving bundle related functions in one place
simplifying getBundleData() method