Merge pull request #13799 from SmithSamuelM/sam_raet_48

Fixed some typos, Also slowed down rate at which presence manage runs
clarify the version numbering scheme
fix error on make clean with no translations
Don't force import of salt.master in integration tests
Merge pull request #13803 from claytron/version-numbers

Clarify version numbering scheme
Added missing versionadded for show_full_context()
Raise a 401 reponse instead of redirecting to the login page

Also fixed bad tests that should have caught this.

Fixes saltstack/salt-api#155.
Allow dot-lookup of Salt functions in Jinja templates
Merge pull request #13804 from whiteinge/show-full-context-versionadded

Added missing versionadded for show_full_context()
Merge pull request #13805 from whiteinge/jinja-dot-lookup-salt-funs

Allow dot-lookup of Salt functions in Jinja templates
Merge pull request #13806 from whiteinge/rest_cherrypy-401-fix

Raise a 401 reponse instead of redirecting to the login page
Don't stacktrace if yard is already there
Merge pull request #13810 from UtahDave/develop

Don't stacktrace if yard is already there
Merge remote-tracking branch 'upstream/develop' into sam_raet_48