manual merge of testURLStream 'assume' fix done in r1055636 (where was lumped into an unrelated commit)