MONDRIAN-1439 - correcting expecteds for some tests in CacheControlTest as well as fixing a bug for excluding regions from an existing segment during a flush