Bug 1006891: removes temporary nagios3 removal code; r=dustin