nrpe-server is taking too long to stop and puppet times out - restart
should hopefully work better

Change-Id: I74e4a5b82c77c3b2b6906544df5ffa3b56273210
Merge "nrpe-server is taking too long to stop and puppet times out - restart should hopefully work better" into production