Resolve upstart job issues

Change-Id: Ie54ae0da74dec9e7a119bd0c10568e70e6efd8e7