Update upstart config to honor storage_dir
Merge branch 'upstart-honor-storage_dir'