Merge pull request #753 from vlabo/develop

Fix automatic merge compile errors

resolver/resolvers.go

@@ -43,6 +43,7 @@ var (
 	systemResolvers       []*Resolver          // all resolvers that were assigned by the system
 	localScopes           []*Scope             // list of scopes with a list of local resolvers that can resolve the scope
 	activeResolvers       map[string]*Resolver // lookup map of all resolvers
+	currentResolverConfig []string             // current active resolver config, to detect changes
 	resolverInitDomains   map[string]struct{}  // a set with all domains of the dns resolvers
 
 	resolversLock sync.RWMutex