Merge remote-tracking branch 'upstream/pull/3327'

diff --git a/test/system/confirmation_resend.rb b/test/system/confirmation_resend_test.rb
similarity index 100%
rename from test/system/confirmation_resend.rb
rename to test/system/confirmation_resend_test.rb