Making test accurately reflect what is going on in the schema migrations test
Fix accepts_nested_attributes for child classes

Closes GH-8131
Merge pull request #8138 from sobrinho/3-2-stable

Fix accepts_nested_attributes for child classes
start could be a string

Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and
eb876c4d07130f15be2cac7be968cc393f959c62

Conflicts:

	activerecord/lib/active_record/relation/batches.rb
	activerecord/test/cases/batches_test.rb
Fix test_find_in_batches_should_use_any_column_as_primary_key
Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag

Support :multiple option on input tags that also have :index
Conflicts:
	actionpack/lib/action_view/helpers/tags/base.rb
	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
Fix the release in the CHANGELOG [ci skip]
Fix find_in_batches against string IDs when start option is not specified.

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/batches.rb
Use a more descriptive test name
Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_with_strings

Fix find_in_batches with customized primary_key on 3-2-stable
backport, handle trailing slash with engines

this is a backport of #8115 to fix #7842
Merge pull request #8149 from senny/backport_7842_to_rails_3_2_stable

backport: handle trailing slash with engines
Merge pull request #8027 from daenney/master

Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.

Conflicts:
	activesupport/CHANGELOG.md
	guides/source/active_support_core_extensions.md
Merge pull request #8093 from nikitug/keep_app_x_ua_compatible

Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)

Conflicts:
	actionpack/CHANGELOG.md
Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.

Public method attributes_before_type_cast used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like read_attribute_before_type_cast and returns unserialised values.
Merge pull request #8082 from nikitug/backport_serialized_attributes_before_type_cast

Backport #8078: Fix `attributes_before_type_cast` for serialised attributes
Revert "Respect children paths filter settings"

This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
Lock sprockets to 2.2.x
Fix redirect example block

See #8160. [ci skip]
Merge pull request #8161 from guilleiguaran/downgrade-sprockets

Lock sprockets to 2.2.x

REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.

In a next release we can relax the dependency again.

See #8099 for more information.