createDataWithinDatesAndPrefix replaced with getMinuteDatesOnEitherSide and flattenAndPutDataInFolder
use flattenAndPutDataInFolder instead of createPeriodicDataset
provide using getMinuteDatesOnEitherSide from TimeUtils
handle single file as inputPath
Merge remote-tracking branch 'upstream/master'

Conflicts:
	merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
Merge pull request #314 from rostafiychuk/master

similar methods deleted
Merge branch 'master' into samarth
overloading waitTillInstanceReachState and increasing wait time of PrismFeedReplicationPartitionExpTest