Merge branch 'sam_cloud' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Allow editable=. for pip.install
Add unit test for event timeouts
Catch os.error instead of all Exceptions
Added exception handler for git repo init
Support Oracle Linux 5.x

Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.

This one line fix solves this issue.

For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
Fixes issue #8951 - gem install fails when rvm is set up with another user
switches paths to state files to use forwardslashes on masterless windows
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Added debug
Update the parser options with values from config file. Fixes #8447.

The way the parser merges the CLI configuration with the file configuration is.

For each option:

  1. If a value was passed to the CLI, that value rules.
  2. If not value was passed to the CLI and no value is defined in the config file. The default, it any, is used.
  3. If a value is not passed to the CLI and the value is defined in the config file, the config file one will be used.

Some code was using the parser options for logic and values after the configuration loaded, but the parser options were never updated to the configuration files values.
So:

  4. Do what we said in the above 3, **and**, update the parser option to have that value.
Support to appending extra_install_flags to windows installer from the winrepo
Support to appending node specific extra_install_flags to windows packages
Adding support to manage networks on Debian/Ubuntu systems.
If a specific repo is requested, force the instalation. Otherwise, zypper asks interactively whether the vendor is to be changed.
Merge remote-tracking branch 'upstream/develop' into develop