Move connection_args.update() to its own line
Fixed check for None dbc
Merge pull request #6561 from whiteinge/grain-osfinger

Added new "osfinger" grain
Add a test mode to mount.set_fstab

This allows the fstab to be checked to see if changes will be made. This
does not change the return value of this function in any way, but just
prevents the fstab from being rewritten if test=True.
Fix regression in mount.mounted state, improve reporting

This fixes the regression from #6545. In addition, running this state in
test mode now properly identifies if the fstab entry exists but needs to
be modified, and reports this in the state output.
Merge pull request #6557 from basepi/stateerror6544

Handle state declarations not formed as a list, Fix #6544
Merge pull request #6565 from kevinfrommelt/fix_query_mysql_module

Fix query mysql module
Merge pull request #6566 from terminalmage/issue6545

Fix regression in mount.mounted state
arg_str needs to be a string of everything passed to salt-ssh
more progress on the ssh state management
Fix json data loading into unicode at the wrong times
start validating file collections for master side compiling
added date header to the smtp returner
Run git fetch after init
Merge pull request #6569 from danieljn/develop

added date header to the smtp returner
Remove unused locking code
Add version comparison to salt.utils

This commit adds version comparison functions like those used for
comparing package versions, so that version comparison can be used
anywhere in salt. Generic version comparison is used, unless a cmp
function is passed to salt.utils.compare_versions.
Remove version comparison code from pkg_resource module

This code is no longer necessary, with the version comparison code moved
to salt.utils.
Replace references to pkg.compare with new func in salt.utils
Remove unnecessary comparison functions

These functions only pointed to functions within pkg_resource.py, which
have since been moved to salt.utils. Remove these as they are now
unneeded.