Handle extra services that can't be found
RR: stubbing the Nagios data so we can get running quickly.
Merge remote-tracking branch 'upstream/master'
RR: updated setting to account for Nagios authentication in tst environment.