Merge "Fix URI resolution for Rfc1808Example* tests"