organization property changes including new custom form et al (VIVO-518)
Merge branch 'maint-rel-1.6' into develop