Merge pull request #6380 from KB1JWQ/osxfixversion

OS X now has an osrelease grain
Merge pull request #6381 from hulu/minion-indents

fix indents in minion.py
FileNotFoundError is from Python 3; rm pointless 'pass'
Merge pull request #6382 from hulu/fix-file-restore_backup

file.restore_backup: FileNotFoundError is from Python 3; rm pointless 'pass'
modules.apache: 2-space indents => 4-space indents
Merge pull request #6383 from hulu/fix-apache-indents

modules.apache: 2-space indents => 4-space indents
Add break statement to avoid obvious warning
rm unused arg osdata from _osx_gpudata
file mod: avoid shadowing stats() function
Merge pull request #6385 from KB1JWQ/fixlogwarn

Add break statement to avoid obvious warning; linux tools don't live on OS X
Merge pull request #6386 from hulu/_osx_gpudata-unused-arg

rm unused arg osdata from _osx_gpudata
Merge pull request #6387 from hulu/file-avoid-stats-shadowing

file mod: avoid shadowing stats() function
Adds windows autoruns enumerator
added logic to umount a mounted filesystem when the mountpoint matches but the device does not (6079)
Merge pull request #6388 from iquaba/develop

Windows Autorun Enumerator
fix pylint problems in modules.win_autoruns
Merge pull request #6389 from hulu/fix-win_autoruns

fix pylint problems in modules.win_autoruns
Fix warning during minion auth due to invalid config param type
Merge pull request #6390 from terminalmage/quickfix

Fix warning during minion auth due to invalid config param type
removed unintended tab characters