Merge pull request #13122 from andrielfn/fix-collection-label-class

Fix the merge of a label class defined inside the block
Conflicts:
	actionpack/test/template/form_collections_helper_test.rb
	actionview/CHANGELOG.md