Remove expect fork from master upstart script

This could be related to the new process manager, but I haven't
investigated fully. At any rate, this allows Upstart to function
correctly when starting and stopping the salt master.
Merge pull request #16548 from cachedout/issue_15133

Remove expect fork from master upstart script