VIVO-745 Eliminating NullPointerException in persistent URI tool
Merge branch 'maint-rel-1.6' into develop