HCSVLAB-459: Return the right kind of object from the find methods
HCSVLAB-459: Correction of case when no data owner is found
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab