Merge "Show password-required message only if $wgRequirePasswordforEmailChange =...