[1553] Merge branch 'trac1553' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1553

tests/lettuce/features/resolver_basic.feature

@@ -2,7 +2,7 @@ Feature: Basic Resolver
     This feature set is just testing the execution of the b10-resolver
     module. It sees whether it starts up, takes configuration, and
     answers queries.
-    
+
     Scenario: Listen for and answer query
         # This scenario starts a server that runs a real resolver.
         # In order not to send out queries into the wild, we only