Add osversion to OS X
Check for type errors on valid config arguments
Merge branch 'develop' of github.com:saltstack/salt into osxfixversion
OS X now has an os version
fix indents in minion.py
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'
Merge branch 'develop' into with-pylint-pragmas