Add in service defs and nrpe timeout bumps.