Fix 9.2 conflicts for "Fix incorrect ETag cache key when relative instance URL is used"
- Encountered conflicts while picking !11964 (merged) onto
9-2-stable
- Please fix the conflicts and merge this into
9-2-stable
/cc @smcgivern
9-2-stable
9-2-stable
/cc @smcgivern