fixing process update test and adding feed update test
Merge branch 'master' into samarth

Conflicts:
	merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
adding InstanceParamTest
Merge branch 'master' into samarth

Conflicts:
	merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
replacing ProcessInstanceResult with InstanceResult, fixing processUpdate test, adding test to feed update
making changes to waitTillInstanceReachState
Merge remote-tracking branch 'remotes/origin/master' into samarth
removing unused imports
making method public as it is used at inmobi
small fix
adding timeout
rebase and review comments
checkstyle
checkstyle
checkstyle
checkstyle
checkstyle ProcessInstanceRerunTest
checkstyle ProcessInstanceRerunTest
checkStyle instance test
replacing thread.sleep with timeutil