Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
VIVO-396 Refactoring JsonServlet and IndividualListController

VIVO-dependent code must be isolated from the Vitro classes, and these classes must be disentangled first. At least some.
Merge branch 'maint-rel-1.6' into develop