[ci skip] Fix broken strict option link in MySQL adapter (4-0-stable)

http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html is broken.

New link: http://dev.mysql.com/doc/refman/5.0/en/sql-mode.html

If the unescaped value contains a null byte, pg 0.18 will raise an
exception.

We should convert when @v is defined not @value.

The test was calling value first that already converts the entry so we
are not catching this bug.

fix identifier error message of partial with unvalid charter

Conflicts:
	actionview/CHANGELOG.md

Conflicts:
	actionview/CHANGELOG.md

Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's
not a good candidate for testing String#squish.

This will make Rails work with i18n 0.6 and 0.7.

Fix html_safe string access modifying frozen values

Conflicts:
	activesupport/lib/active_support/core_ext/string/output_safety.rb
	activesupport/test/safe_buffer_test.rb

Allow authentication header to not have to specify 'token=' key.

Conflicts:
	actionpack/CHANGELOG.md

Improve token_and_options regex and test

Millisecond inequality causes failures on Travis

Fix options overwritten by super
Conflicts:
	actionpack/lib/action_view/helpers/tags/text_field.rb

Fix tests on 4-0-stable

- Russian time was changed to UTC+3 from UTC+4 recently. This broke the
  string_to_ext test.

Bugfix config.action_view.default_form_builder option

Conflicts:
	activerecord/test/cases/adapters/postgresql/array_test.rb

Backport of dcc143cd

Fixes #12856
Closes #14088

Prior to this patch you'd end up with an error like:

```
ActiveRecord::RecordNotFound: Couldn't find <Model> with 'id'=<id> [WHERE (<default_scope condition>)]
```

Conflicts:
	activerecord/CHANGELOG.md

Option passing was already supported when using `create_table` but not
for `change_table`. This patch aligns the method signatures.

Conflicts:
	RAILS_VERSION
	actionmailer/lib/action_mailer/version.rb
	actionpack/lib/action_pack/version.rb
	activemodel/lib/active_model/version.rb
	activerecord/lib/active_record/version.rb
	activesupport/lib/active_support/version.rb
	railties/lib/rails/version.rb
	version.rb

make sure that unreadable files are also not leaked

CVE-2014-7829

* 4-0-sec:
  bumping version for relesase
  correctly escape backslashes in request path globs

make sure that unreadable files are also not leaked

CVE-2014-7829

Time includes DateAndTime::Zones acts_like(:time)
Conflicts:
	activesupport/lib/active_support/core_ext/time/zones.rb

Closes #17586

Fix that a collection proxy could be cached before the save of the owner, resulting in an invalid proxy lacking the owner’s id

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
	activerecord/test/cases/associations/has_many_associations_test.rb

Fixes #14180
Fixes #17461