Merge "Actually make $wgNoReplyAddress default to $wgPasswordSender"