VIVO-520: PropertyConfig additions to address missing properties
Merge branch 'maint-rel-1.6' into develop