VIVO-786 and VIVO-751 changes to default property annotations and 1.7 migration