Two more cases where we can end up with non-absolute URLs. Make sure we
add the "webroot" in those cases.
Merge branch 'public/7.7' into public/7.8