VIVO-566 reverting back to vivo:Dataset
more property cleanup
Merge branch 'maint-rel-1.6' into develop