Move upstart script to the correct place

Not in a subdir but with a .upstart suffix

Change-Id: I01888d2e223bd9631f0d2d5aafa5029e27dd5987