New nagios config should be generate after not before removing orphaned
services.
Merge branch 'release-0.28.x'
Factor out and make public the helper method defining the database options
with the defaults extracted from the service configuration.