Merge pull request #18350 from thatch45/key_race

Fix key gen race condition, fix #17289
Merge pull request #18357 from tjyang/develop

enable "make cheatsheet"
Fix for #8670

We should only update the wait timeout on mis-matched event if we had a timeout to begin with
check for the OSError that libnacl might throw if libsodium is no here
Merge pull request #18364 from thatch45/nacl_check

check for the OSError that libnacl might throw if libsodium is no here
Add regression test for #8670

Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
Merge pull request #18281 from cro/mdadm_update

Properly quote parameters to mdadm
Fix part 1 of #18353
Fix for #15663

On a requisite failure, instead of saying "something failed" we can determine what the failures where by looking at the requisites of the lowstate running, and see which ones failed.
More comments, and a more specific key for the comment_dict (so you can know which SLS it was)
Add non standard opts into saltfile
Add extra_filerefs to salt-ssh options
initial sdicode function
make the encodings list more robust
get the right locale
Merge branch '2014.7' into merge-forward

Conflicts:
	salt/modules/glusterfs.py
	salt/modules/macports.py
	salt/modules/makeconf.py
	salt/modules/mdadm.py
	salt/modules/smartos_vmadm.py
	salt/modules/zypper.py
	salt/utils/event.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/unit/netapi/rest_tornado/test_handlers.py
unicide, prevent returning None
disable lint error
Merge pull request #18367 from thatch45/sdecode

initial sdicode function
Fixes of pylint violations