On Thu Jul 06 21:42:14 2017, michal wrote:
> Added a missing dns_name_format() call to one of the loops inside
> dns_catz_zones_merge().  Updated catalog zones system test to ensure
> proper logging of added member zone names.
> 
> While investigating why this issue has not been caught earlier, I also
> found out that the catalog zones system test was improperly handling
> waiting for multiple log messages in named.run: every time the system
> test expected two log messages to appear, timing out while waiting for
> one of these messages was effectively not considered an error as long as
> the other message appeared in the log as expected.  All instances of
> this problem were fixed and it did not cause the system test to detect
> any further issues.
> 
> All the above fixes are in the rt45520 branch, please review.  They will
> need to be cherry-picked into v9_11 as well.

Looks fine.