SF bug #902037: relative on-disk SYSTEM id handling is incorrect (Contributed by Bob Ippolito.)
SF bug #902037: relative on-disk SYSTEM id handling is incorrect
(Contributed by Bob Ippolito.)

backport candidate.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator