Bug 1006891: removes nagios3; r=callek
Bug 1055401 - Run slaverebooter more often than once every 4 hours. r=coop

--HG--
extra : rebase_source : 97f852d798ae95b62711b3225d5ddc4607b4d0f4
Merge from default

--HG--
branch : production