alternative way of restarting windows minion
Merge branch '2014.7' into merge-forward

Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
Bad merge conflict resolve runner.py
Fixes to random.org module removing unnecessary arguments to function calls.
Merge branch '2014.7' into develop

Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
Remove quotes from s3fs ETag entries

This causes md5 comparisons to fail and makes the master think it needs
to re-download every file.
Merge branch 'merge-forward' of https://github.com/basepi/salt into develop

Conflicts:
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	tests/unit/modules/boto_vpc_test.py
Added factory for MasterEvent when using raet
Merge remote-tracking branch 'upstream/develop' into sam_call2

Conflicts:
	salt/master.py
	salt/runner.py
	salt/utils/raetevent.py
Disable the false import error
Merge branch '2014.7' into develop

Conflicts:
	tests/unit/modules/boto_vpc_test.py
Don't assume the `PATH` env var is exists.
Don't assume the `PATH` env var is set
Don't assume the `PATH` env var is set
Merge branch '2014.7' into develop
Remove unused import
Remove PyLint disable rule in 2014.7

Since it's unlikely we upgrade PyLint in this branch
fixes #18632 (os.path.expanduser does not expand quoted paths)
Merge branch '2014.7' into develop

Conflicts:
	tests/unit/modules/boto_vpc_test.py
Dell DRAC runner