Use getControlGroup()in contact edit form
Merge remote-tracking branch 'remotes/upstream/staging' into patch-15
Use non-deprecated method
Merge pull request #3215 from wilsonge/patch-15

[#33393] Use getControlGroup()in weblink edit form