The various collection methods (entrySet, keySet and values) on the DataContainer are very inconsistent causing possible confusion of their usage. All usages of these methods in the code base could instead use iterator or iteratorIncludingExpired methods. We should deprecate the collection methods for preparation of removing them in 10.