Improved config update (master side)
Fixed the NRPE config line about sbire
Improved config update (sbire side)
Merge branch 'branch'