[NUCCORE-1100] Map.values() should return Collection not Set, and change
API of MapStore to match