HCOLL-268 refactored the JSON convertor
Merge remote-tracking branch 'origin/master'
HCOLL-268 refactored out the DataValueConverter