Fix it properly this time by forcing a PID from run.sh and using that to track.
A second issue is that upstart may run services twice, introduce a flock test
to ensure that we only run stack.sh once as running in parallel causes issues.
Change-Id: I05990c7154366350b0f9cc3e6c70d6f34238486f