extend fileserver runner with additional features
PEP8 E302 fixes in fileserver runner
change fileserver runner default output module to nested
fix integration test in fileserver runner, refs #16008
changing param back to backend in fileserver to improve useability
Fix broken test on 2014.7
Correct version added and depricated

Fixes https://github.com/saltstack/salt/issues/14983
add rotate_aes_key option to config

Conflicts:
	salt/config.py
rename key_no_rotate to rotate_aes_key

Conflicts:
	salt/key.py
add rotate_aes_key documentation to master-configuration reference
rename the parameter in salt-key also, otherwise it will never rotate the key
Merge pull request #16042 from basepi/cherrypickmisc

Misc Backports
Merge pull request #16031 from rallytime/bp-16008

Backport #16008 to 2014.7
Clean up salt raet routing logic in prep for unique naming versus roles
Merge pull request #16043 from SmithSamuelM/2014.7_sam4

Clean up salt raet routing logic in prep for unique naming versus roles
Merge pull request #16033 from rallytime/fix_2014.7_tests

Fix broken test on 2014.7
Fix pylint errors on 2014.7
I missed one
Merge pull request #16046 from rallytime/pylint_fix

Fix pylint errors on 2014.7
Merge branch '2014.7' into develop

Conflicts:
	salt/config.py