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