VIVO-556: properties appearing twice
Merge branch 'maint-rel-1.6' into develop