Ambari install wizard step4 commit
Merge branch 'branch-1.2' of git://github.com/roofmonkey/ambari into branch-1.2

Conflicts:
	ambari-web/app/controllers/wizard.js
	ambari-web/app/data/service_configs.js
	ambari-web/app/data/services.js
	ambari-web/app/initialize.js
	ambari-web/pom.xml
Step5 changes to not show components when HDFS is not selected.
step7 fixes to assets/data/wizard/HCFS.json
Merge branch 'branch-1.2' of https://github.com/roofmonkey/ambari into branch-1.2

Conflicts:
	ambari-web/app/initialize.js
	ambari-web/pom.xml
set testmode=false for push.