VIVO-366 change to annotation-to-PropertyConfig converter to deal with multiple values
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop