convert the port to a string
Updated the documentation for file.py to cover cases with a leading zero for the mode
Merge remote-tracking branch 'upstream/develop' into develop
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
Merge pull request #7113 from mafrosis/git-symlinks

Handle symlinks to directories in git when force applied
Merge pull request #7112 from gravyboat/develop

Updates to file state documentation to resolve issue 6503.
Merge pull request #7095 from riverajo/postgres-port

convert the port to a string
make supervisor understand process groups
E501 and whitespace