Add check service status

(there's a pull request already for the ms change, apologies for not splitting this out)

the other change here is an upstart check