Resolve "nsupdate tests fail intermittently"

Merged Mark Andrews requested to merge 424-nsupdate-tests-fail-intermittently-v9_12 into v9_12

Merge request reports