Make the old and new 'named.conf' look more alike. Aside from cosmetic changes, the 'view' names and 'match-clients' options are synced.
This updates the 'tests.sh' slightly such that the expected view name is set correctly.
Also fix a typo (the second part of the checks is for the internal zone, and not the external one).
Closes #2631 (closed)