fix tests of zone management with new behaviour when trying to create a zone with existing id
Merge remote-tracking branch 'origin/master'