Merge branch 'master' into samarth
overloading waitTillInstanceReachState and increasing wait time of PrismFeedReplicationPartitionExpTest
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