Merge branch 'installerFixes' into enterprise-2.1

Conflicts:
	oo-install/workflows/enterprise_deploy/launcher.rb