Add version of Master to manage.versions output.
Backport #14422 to 2014.7
Merge branch '2014.7' into develop

Conflicts:
	salt/runners/manage.py