Merge pull request #7820 from cvrebert/patch-4

utils/validate/net.py: simplify mac()
Merge pull request #7828 from corywright/fix_mysql_grant_absent_strings

fixes #7827 - String formatting is broken for mysql_grants.absent
Merge pull request #7831 from jesusaurus/rabbitmq

Setting owner permissions fails if the vhost was not added
Merge pull request #7834 from cachedout/develop

Fix #7695 and add self to AUTHORS
Merge pull request #7836 from terminalmage/freebsdports

Initial commit of freebsdports module
Merge pull request #7837 from terminalmage/quickfix

Fix incorrect versionadded directives
Fix remove possible trailing slash in name of mounted state
Refreshed build instructions for Windows
Added salt.utils.validate to setup.py.
Merge pull request #7843 from valentinbud/develop

Added salt.utils.validate to setup.py.
Merge pull request #7838 from ekatsah/fix-trail-slash

Fix remove possible trailing slash in name of mounted state
Merge pull request #7799 from eliasp/auth-ldap

External auth LDAP improvements
Merge pull request #7840 from scottp-dpaw/patch-1

Refreshed build instructions for Windows
Catch AttributeErrors and fall back to default outputter. Refs #7845.
Updated salt.states.alternatives to fix incorrect docstring.

Doc string for salt.states.alternatives.set_ appears to be compied and pasted from salt.states.alternatives.remove and does not correspond to what the set_ actually method does.  Fixed this.
Give them both! This should make some cleaner middle ground here
Merge pull request #7847 from cachedout/develop

Catch AttributeErrors and fall back to default outputter. Refs #7845.
Merge pull request #7848 from loz-hurst/develop

Updated salt.states.alternatives to fix incorrect docstring.
Merge pull request #7675 from Caustic/overstate-patch

overstate: Patching to fail on requisite failures.
Merge pull request #7807 from scottp-dpaw/develop

Bootstrapping for Windows minions