Remove unneeded store definition from store xml
Non contiguous zone/node ids test for atomic setting of metadata pair