generate data fix, acl fix in FeedMerlin
Merge pull request #138 from karishmag9/master

generate data fix, acl fix in FeedMerlin
uncommenting token code
fixing pom
Merge pull request #140 from raghavgautam/pomfix

fixing pom
added new profile
added new profile
Merge pull request #141 from karishmag9/master

added new profile hadoop-cdh4 to pom
AuthorizationTest amended, FeedReplicationTest created, 3 test cases added
U1SuspendU2ResumeFeedInstances test case added
U1KillU2RerunFeedInstances test case added, other tests refactored, fixed
Multiple clusters avoided, FeedInstances tests removed
FeedMerlin#createTestData fixed
fixed after rebase form upstream
U1Schedule feed, U2Shedule dependant process, U1 updates feed, check if new bundles were created
new test amended
Merge remote-tracking branch 'origin/master'

Conflicts:
	merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java
	merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java