Refine the script that scans for obsolete URIs
Merge branch 'maint-rel-1.6' into develop