VIVO-502 fix bugs in editable property merge