Trim site name on Special:SetSiteLink

... plus a bit of code clean-up.

Change-Id: Ia1d5b4a63bba83b39a085725e8c4cbcdd4cc3d85
Merge "Trim site name on Special:SetSiteLink"