v4.x backport: url: fix inconsistent port in url.resolveObject
v4.x backport of #8214
/cc @TheAlphaNerd
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
v4.x backport of #8214
/cc @TheAlphaNerd