Add a CLI example to config.merge
Merge pull request #6586 from whiteinge/grains-filter_by

Added function filter_by to grains module
Added new single module interface to salt clients
use low instead to make transfer easier
Call runner async exec and return runner jid
Add runner check to ck minions
Merge remote-tracking branch 'upstream/develop' into unify-api
Allow the resolver to verify if a token is still valid
Add master_call to runner client
Now uses new auth Resolve instead of Load
Merge remote-tracking branch 'upstream/develop' into unify-api
Merge remote-tracking branch 'upstream/develop' into unify-api
Merge pull request #6585 from basepi/schedulerfix

Fix scheduler configuration from Pillar, Fix #6201
Using new runner.master_call
create_token
verify_token methods added
Overhaul (most of) bluez.py to work with BlueZ 5.7
Fix _fulfills_version_spec

This was caught by travis:

https://travis-ci.org/saltstack/salt/jobs/9999843
Revert "Fix bad ref to srcpath"

This reverts commit 39b98a35e4014faf1cffe5e7c3f3ff178aee4b93.
Revert "Merge pull request #6573 from erchn/develop"

This reverts commit 3e1df4f901a359e2177825b438563f31886681dc, reversing
changes made to 9f2018fff435787a8e0b6dc3f93496e0fd1de4db.
Merge pull request #6583 from terminalmage/issue5270

Fix _fulfills_version_spec
Fixing on/off issues with power() function