Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"

This reverts commit babc24c1b07c1fd58b9b3249b0256f9b0d45c0f0.

Conflicts:

	activerecord/test/cases/adapters/mysql/connection_test.rb
	activerecord/test/cases/adapters/mysql2/connection_test.rb
Preparing for 4.1.6.rc1 release
Merge pull request #16349 from jmcnevin/master

Correctly determine if migration is needed.
Fixes the digits counter of AS's NumberToRoundedConverter

Zero has one digit, but Math.log10(0) returns -Infinity. The method
needs to special-case zero.

The patch adds a regression test that is not clearly related to the
underlying issue because digit_count is private and has no coverage.
Gray area.

This bug was uncovered by 60062cf.
Merge pull request #16649 from Agis-/pg-columns-for-distinct

Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't
CHANGELOG & improvements to #16649

* Require either FIRST or LAST qualifier for "NULLS ..."
* Require whitespace before "NULLS ..."

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #16756 from huoxito/dont-mess-railties-default-order

Dont mess with default order engines load (4.1.6.rc1 regression)
Do not mark object as persisted after an association is saved

Callback order in Active Record objects are important. Users should not
define callbacks before the association definition or surprising
behaviours like the described at #3798 will happen. This callback order
dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227.

This reverts #15728.

Fixes #16620.

Conflicts:
	activerecord/test/cases/associations/has_many_associations_test.rb
Preparing for 4.1.6.rc2 release
Use latest 2.1 version of sprockets-rails
Allow included modules to override association methods.

Closes #16684.

This is achieved by always generating `GeneratedAssociationMethods` when
`ActiveRecord::Base` is subclassed. When some of the included modules
of `ActiveRecord::Base` were reordered this behavior was broken as
`Core#initialize_generated_modules` was no longer called. Meaning that
the module was generated on first access.

Conflicts:
	activerecord/test/cases/attribute_methods/read_test.rb
Preparing for 4.1.6 release
Merge branch '4-1-6' into 4-1-stable

Conflicts:
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
Merge pull request #16669 from aantix/dangerous_attribute_error_better_message

Improved the error messaging for the DangerousAttributeError exception
Fix a bug where malformed query strings lead to 500

If a request contains an malformed query string, Rails responds with an
internal server error insted of a bad request. This is because
ActionDispatch::PublicExceptions calls request#formats and it raises an
ActionController::BadRequest from inside ActionDispatch::ShowExceptions,
hence the 500 error.

This commit changes PublicExceptions to catch BadRequest if raised from
request#formats.

fixes #11502
Merge pull request #16886 from yuki24/bugfix-bad-request-from-public-exception-4-1-stable

[4-1-stable] Fix a bug where malformed query strings lead to 500
Merge pull request #16486 from yahonda/backport_16196_to_4-1-stable

Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"
Put the CHANGELOG entry in the right place [ci skip]
Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error

Use dynamic path for dummy app location in plugin's test_helper.rb
Conflicts:
	railties/CHANGELOG.md
Implement #take and #take! on associations such as has_many.  Fixes #16934.