VIVO-483 Adjust indexing code for the ISF

This class should not have been in Vitro, since it uses VIVO URIs and is never referenced in Vitro. Also, it needed updating to match the ISF.
Merge branch 'maint-rel-1.6' into develop