modified:   merlin-core/pom.xml

	modified:   merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
	modified:   merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
	modified:   merlin-core/src/main/java/org/apache/falcon/regression/core/util/XmlUtil.java
	modified:   merlin/pom.xml
	modified:   merlin/src/main/resources/Merlin.properties
	modified:   merlin/src/main/resources/ivoryqa-1.config.properties
	modified:   merlin/src/main/resources/prism.properties
	modified:   merlin/src/test/java/org/apache/falcon/regression/hcat/SubmitClusterHcat.java
	modified:   merlin/src/test/resources/hcat_2/cluster-0.1.xml
	modified:   merlin/src/test/resources/hcat_2/feed-template1.xml
	modified:   merlin/src/test/resources/hcat_2/feed-template2.xml
	modified:   pom.xml
	merlin-core/src/main/java/org/apache/falcon/regression/core/util/HCatUtil.java
	merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetention.java