CMS-4390 Data V2 - Change DataSet to be a value of type  PropertySet
Renamed Property.getValueType to getType
Included Property.id in the Property.equals method