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
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
Merge pull request #7109 from terminalmage/issue6994

rework the augeas state/module
Fix pylint

Apparently jenkins' pylint doesn't like arguments to have default values
that are mutable types, such as empty lists. This fixes that.
Merge pull request #7111 from terminalmage/quickfix

Fix pylint
Merge remote-tracking branch 'upstream/develop' into develop
Fixed formatting issues/wording in file.py to better match what is present on the troubleshooting page
Move platform-specific pkgdb check to ebuild.py

In preparation for adding similar pre-flight checks to the yumpkg
providers, this commit moves the pre-flight checks done for Gentoo to
ebuild.py.
Use new pkg.checkdb function for pre-flight checks

This establishes a new convention for pkg.installed states: If it is
considered necessary, pre-flight checks can be done to determine if
possible matches can be found for packages with ambiguous names.
Currently this applies to Gentoo-based distros for which package names
are provided without the category, and will (in a later commit) be
expanded to support the yumpkg providers.

In the case of yumpkg{,5}, yum will automagically resolve package names
like "vim" to their actual name, "vim-enhanced", but this breaks
post-install verification of package targets since "vim" !=
"vim-enhanced". The solution, like with Gentoo, will be to attempt to
detect the possible matches for a given package name, and then fail out
of the state. This way, the user will be given a clear indication of the
proper changes to make to their states, and ambiguous package names will
not be tolerated.
handle symlinks to directories in git when force applied
More mknod doc edits/additions. Fixed pylint score in relation to the addition of mknod functionality.
Added my name and email
Merge remote-tracking branch 'upstream/develop' into feature_mknod