Merge branch 'trac2430'

diff --cc src/lib/dns/tests/master_loader_unittest.cc
Simple merge

diff --cc tests/lettuce/configurations/.gitignore
index 7514b3b99b3165d315bcee3c905928a0cb65192f,50013a55ed049343767d8267fb4859c86f19b496..f534cf654baa55a323caf2d1642947c54f4416b5
--- 1/tests/lettuce/configurations/.gitignore
--- 2/tests/lettuce/configurations/.gitignore
+++ b/tests/lettuce/configurations/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
  /bindctl_commands.config
  /example.org.config
+ /generate.config
  /root.config
 +/static.config

diff --cc tests/lettuce/features/terrain/terrain.py
Simple merge