integration stuff
Merge pull request #10708 from otrempe/develop

Add option in reg state and module to disable reflection on Windows 64-b...
Merge pull request #10709 from mgwilliams/postgres

postgres_users: report changes when user is created
Merge pull request #10712 from gtmanfred/uptodate

Uptodate
Merge pull request #10715 from edlane/develop

rename map.py to diff.py, sort minions within a pool, ...
Merge pull request #10731 from terminalmage/tests

Add comment about importance of empty line
Merge pull request #10734 from rallytime/mac_user_test

More mac_user tests
Merge pull request #10735 from danielfrg/patch-1

Not verbose by default
avoid shadowing of info() in dockerio module
Merge pull request #10743 from hulu/docker-info-shadowing

avoid shadowing of info() in dockerio module
Merge remote-tracking branch 'upstream/develop' into sam_raet_11

Conflicts:
	salt/daemons/__init__.py
Merge remote-tracking branch 'upstream/develop' into sam_raet_11
This should really be an else
Merge pull request #10744 from SmithSamuelM/sam_raet_11

Sam raet 11  salt.daemons.IofloMaster and IofloMinion now work basically
Started writing unit tests for mac_group
Merge pull request #10736 from nshalman/smartos-smf

SMF Fixes (SmartOS / Solaris)
Starting adding reliability to Joiner transaction
fix moved ioflo gateway classes
Call the corect ioflo gateway class
fixed typo