WIP - Reenable monitoring of services (Pending to fix because now scripts are not found). This is a partial rollback of commit bbb997ab4df01427a543dccabda04f1e0562b849