convert the port to a string
Merge remote-tracking branch 'upstream/develop' into feature_mknod
Updated the documentation for file.py to cover cases with a leading zero for the mode
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7098 from KennethWilke/develop

Some improvements to the keystone module
Merge pull request #7099 from KennethWilke/develop

removed token default setting
Fixed #6803 -- Added example to ignore serving vim swapfiles
Merge pull request #7101 from KennethWilke/develop

keystone: added password validator, fixed docs
Add routines to detect if files are bins to utils
initial fix for #6698
Fix #6698
Merge pull request #7100 from micahhausler/develop

Fixed #6803 -- Added example to ignore serving vim swapfiles
Merge pull request #7102 from KennethWilke/develop

Added keystone state module
Add set and auto to alternatives

Add support to manually set the alternative
path for a name and to restore the name to
auto mode.

Change-Id: I36a816a7068ed8af8f60a6fbe3bdaf1bdca6c825
mem_total in BSD should return as an int, see #7104
Merge pull request #7107 from brunson/develop

Add set and auto to alternatives
Rework the augeas state/module

Corrected some style faux-pas in the state, and made the arguments more
"salty" by making them key-value pairs, rather than space delimited
value pairs. Also corrected invalid "changes" return data.

In the module, made some of the logic more Pythonic, as well as raising
exceptions when invalid arguments are specified.
docs update: add augeas state to toctree
Fixed wheel function event generation so it fires on tokenized as well as credentialed commands
Fixed formatting of events so that it is consistent with how runner function event data
Changed username field to be user  in event data to match how it is returned in standard minion job returns
Merge pull request #7109 from terminalmage/issue6994

rework the augeas state/module