Fix https://github.com/saltstack/salt/issues/6785

Fix issue #6785 and also allow upstart scripts to read /etc/defaul files.