Merge pull request #6556 from danieljn/develop

added status.diskusage to status.status_all
Fix formatting and pylint in augeas state
Merge pull request #6559 from basepi/augeasformatting

Fix formatting and pylint in augeas state
Handle state delcarations not formed as a list, Fix #6544
Added new "osfinger" grain

This grain is a unique identifier for a given OS and OS version that can
also be used as the key in a dictionary. For example a fingerprint for
CentOS 5.9 would be "CentOS-5", a fingerprint for Precise would be
"Ubuntu-12.04".
Minior changes to manage openstack expectations
Fix whitespace and formatting in couchdb returner
Merge pull request #6562 from basepi/couchdbformatting

Fix whitespace and formatting in couchdb returner
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