Continued minor changes in property placement and ordering
updates for issues VIVO-507 and VIVO-589
Merge branch 'maint-rel-1.6' into develop