Initial changes to mysql module to allow us to get useful output from SHOW and DESC queries to the server
added support for order clauses in pillar top files

Conflicts:
	tests/unit/pillar_test.py
Fix some formatting
Add config.merge function for merginc config values across sources
Use config.merge instead of config.option for scheduling, Fix #6201
Debian Package Architechture

Debian packages are allowed to designate the package as
architecture-independent by specifying the value 'all' in the
Architecture field of debian/control. Update
salt.modules.apt.install (via
salt.modules.pkg_resource._parse_pkg_meta) to respect this and not
require ':all' appended to a package name in order to install it on a
64bit machine.
Add a CLI example to config.merge
Merge pull request #6585 from basepi/schedulerfix

Fix scheduler configuration from Pillar, Fix #6201
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
Enable discoverable and noscan modes in bluez
Fix #5084
Update assert in test_pip_installed_weird_install

Pull #6574 changed the state output slightly, breaking this test. This
commit fixes the test.
Merge pull request #6589 from techhat/bluetooth

Overhaul (most of) bluez.py to work with BlueZ 5.7
Merge pull request #6590 from terminalmage/pip-test-fix

Update assert in test_pip_installed_weird_install
check local pip version on --pre flag