[5.x] Update embed_url and trackable_embed_url modifiers to be valid with additional query strings

[5.x] Update embed_url and trackable_embed_url modifiers to be valid with additional query strings #2241