Merge pull request #402 from openshift/openshift-origin-release-4

Openshift Origin Release 4
Fixed def args for ruby 1.8 compliance
Merge pull request #404 from nhr/oo_install_fix_for_ruby18

Fixed def args for ruby 1.8 compliance
Remove unnecessary env clearing for localhost deployments
Merge pull request #405 from nhr/remove_obsolete_env_handling

Remove unnecessary env clearing for localhost deployments
Bug 1120795 - Fixed error reporting for unsupported OS types.
Merge pull request #407 from nhr/bug_1120795

Bug 1120795 - Fixed error reporting for unsupported OS types.
Modify scp command so that debug info will display
Merge pull request #410 from nhr/expose_scp_debug

Modify scp command so that debug info will display
Bug 1120966 - delaying removal of 'local' puppet config files until after deployments completed
Merge pull request #412 from nhr/bug_1120966

Bug 1120966 - delaying removal of 'local' puppet config files...
Modified oo-install to handle an HA config edge case in display
Merge pull request #416 from nhr/ha_edge_case_fix

Modified oo-install to handle an HA config edge case in display
Added a missing requires to originator.rb
Merge pull request #418 from nhr/originator_requires

Added a missing requires to originator.rb
Updated to use puppet module v4.0.6
Merge pull request #421 from nhr/puppet_module_update

Updated to use puppet module v4.0.6
Bug 1124974: Fixed typo
Merge pull request #424 from nhr/bug_1124974

Bug 1124974: Fixed typo
Bumped installer to use latest module