Checkpoint URI fixups, and 1.8.7 stuff
Merge develop
Merge branch 'develop' into devpatch
Not ATP on 1.8, but ATP on 1.9, no bad errors: free URIs and test artifacts
Merge branch 'develop' into devpatch
minor cleanup re 1.8.7 work
Merge branch 'devpatch' into develop