Merge branch 'master' into PE-3182

Conflicts:
	spec/unit/face/module/install_spec.rb
	spec/unit/face/module/list_spec.rb
	spec/unit/face/module/uninstall_spec.rb
	spec/unit/module_tool/applications/installer_spec.rb
	spec/unit/module_tool/applications/uninstaller_spec.rb
	spec/unit/module_tool_spec.rb