Changes to tolerate non-static bundleresource URI host values