Remove direct association of zone with establishment entity and retain zone association through department
Closes VSN-1698