Add osversion to OS X
Merge branch 'develop' of github.com:saltstack/salt into osxfixversion
OS X now has an os version
Merge pull request #6380 from KB1JWQ/osxfixversion

OS X now has an osrelease grain