Merge "Remove dead code after removal of cancel button on Special:ChangeEmail"