TimeUtil.sleepSeconds() added
Thread.sleep replaced with TimeUtil.sleepSeconds
TimeUnit.SECONDS.sleep replaced with TimeUtil.sleepSeconds
sleepSeconds(long) deleted
using resource loader so class path is considered first
using resource loader so class path is considered first
using resource loader so class path is considered first
fixing submitAndScheduleAllFeeds
dependentProcessSucceeded
review comment
FirefoxProfile for SPNEGO fixed
Merge remote-tracking branch 'upstream/master' into timeutil

Conflicts:
	merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java
	merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
	merlin/src/main/java/org/apache/falcon/regression/ui/pages/Page.java
	merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java
	merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
	merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
	merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
Merge pull request #326 from rostafiychuk/spnegofix

FirefoxProfile for SPNEGO fixed
Merge pull request #321 from rostafiychuk/timeutil

Thread.sleep replaced by TimeUtil method
Merge pull request #324 from samarthgupta437/samarth

using resource loader so class path is considered first
cleaning up ClusterMerlin
cleaning up FeedMerlin
cleaning up ProcessMerlin
removing a variable from Util.java
making logger variable private