Fixed merge conflict for #7395
Fixed wrong return statement
Merge pull request #7573 from whiteinge/gen_hash_grains

Added function to generate a password or key and store in local grains
Merge pull request #7575 from whiteinge/django-admin-path

Fail if django-admin script cannot be found; also check without .py ext
Merge pull request #7582 from scott-w/hg_clean

Hg Clean
Merge pull request #7603 from s0undt3ch/features/named-salt-versions

Add support for the future Salt named versions
Merge pull request #7606 from malinoff/fix-wrong-return

Fixed wrong return statement
Merge pull request #7187 from ajithhub/nics_as_list

Reorganize NIC Profiles as list of interfaces
Prefix deprecation warning versions with `Salt` for clarity.
The format version holder does not get auto populated in the `ret` warnings.
Adapt remaining test cases which relied on old versioning scheme.
Fix PEP-8 E302
Fix PEP-8 E302
Fix PyLink E1120 introduced in d3852568
Fix PyLink C0103
Merge pull request #7607 from s0undt3ch/features/named-salt-versions

Fix remaining test cases and some minor fixes for named versions support
Merge pull request #7608 from s0undt3ch/hotfix/lint

Some PEP8/Pylint fixes
Convert augeas values passed to setvalue() to strings

This fixes an issue where numeric values would fail because the
setvalue() function tries to compare them using str.startswith().
Merge pull request #7609 from terminalmage/issue7605

Convert augeas values passed to setvalue() to strings
Pylint fixes