Merge pull request #16328 from noinkling/template_password_confirmation_fix

Give password_confirmation div the "field" class in the scaffold generator "_form" partial

Conflicts:
	railties/CHANGELOG.md