Merge branch '2014.7' of https://github.com/saltstack/salt into develop
Refactor master to a new Maintenance class
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'master_maint' into maint_develop

Conflicts:
	salt/master.py
Re-civilize maintenance functions
Info log messages on component startup
Lint
Merge pull request #17018 from cachedout/maint_develop

Create and cleanup master maintenance process