MLHR-1011 #resolve
MLHR-1019 #resolve
Merge branch 'prop_2_item.MLHR-1011' into ip_port.MLHR-1019

Conflicts:
	front/js/app/lib/widgets/ConfigWelcomeWidget/HadoopView.html
	front/js/app/lib/widgets/ConfigWelcomeWidget/SystemView.html
Merge branch 'dt-0.9.5' into prop_2_item.MLHR-1011
Merge branch 'prop_2_item.MLHR-1011' into ip_port.MLHR-1019
Merge pull request #891 from andyperlitch/ip_port.MLHR-1019

Make ip and port on same line in install wizard, system view