Oopsie.  Master upstart script should run master; not minion.
Merge pull request #3907 from skellock/develop

Oopsie.  Master upstart script should run master; not minion.