Fix the bug of failing to delete zone while disconnected AP exist in this zone
Merge from Perforce
Merge branch 'bug/multi_cluster'