VIVO-542 fixes bug with restriction deletion and various small improvements
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
performance tweak in ABoxRecomputer
VIVO-533 When loading templates, mimic the language filtering of the RDFService.
Merge branch 'maint-rel-1.6' into develop