Pull in Justin's nagios pid file fix.
Pull in Justin's nagios pid file fix.

MaximilianMeister/crowbar,tserong/crowbar,rsalevsky/crowbar,SUSE-Cloud/crowbar,aplanas/crowbar,nkrinner/crowbar,mmnelemane/crowbar,aspiers/crowbar,toabctl/crowbar,vwallfahrer/crowbar,mmnelemane/crowbar,rhafer/crowbar,rhafer/crowbar,aspiers/crowbar,SUSE-Cloud/crowbar,aplanas/crowbar,dirkmueller/crowbar,vwallfahrer/crowbar,rhafer/crowbar,crowbar/crowbar,crowbar/crowbar,nkrinner/crowbar,tserong/crowbar,dirkmueller/crowbar,MaximilianMeister/crowbar,rsalevsky/crowbar,toabctl/crowbar