Merge pull request #17360 from bronzle/includes_and_unscoped

copy reflection_scopes’s unscoped value when building scope for preloading

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #17518 from prathamesh-sonpatki/fix-activesupport

Fix broken string_ext_test due to change in timezone
Merge pull request #17552 from jipe/master

Guides: Corrected name for assigns key [ci skip]
Merge pull request #11694 from Empact/association-bind-values-not-updated-on-save

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
Merge branch 'rm-fix-secret-token-fallback'

Conflicts:
	railties/CHANGELOG.md
Make FlashHash#key? work with symbol and string

Closes #17586
Merge pull request #17047 from betesh/master

Time includes DateAndTime::Zones acts_like(:time)
Merge branch '4-1-sec' into 4-1-stable

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

make sure that unreadable files are also not leaked

CVE-2014-7829
Preparing for 4.1.7.1 release
Merge branch '4-1-7-1' into 4-1-stable

Conflicts:
	RAILS_VERSION
	actionmailer/lib/action_mailer/gem_version.rb
	actionpack/lib/action_pack/gem_version.rb
	actionview/lib/action_view/gem_version.rb
	activemodel/lib/active_model/gem_version.rb
	activerecord/lib/active_record/gem_version.rb
	activesupport/lib/active_support/gem_version.rb
	railties/lib/rails/gem_version.rb
	version.rb
Sync changelog
Fix shell quote on the release task
`timestamps` and `add_timestamps` pass additional options. Closes #17624

Option passing was already supported when using `create_table` but not
for `change_table`. This patch aligns the method signatures.
make it possible to access fixtures excluded by a `default_scope`.

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
Fixing wrong link in 'Ruby on Rails Security Guide' [ci skip]

The URL

http://www.h-online.com/security/Symantec-reports-first-active-attack-on-a-DSL-router--/news/102352

points to an article titled 'The H is closing down'. The good one is:

http://www.h-online.com/security/news/item/Symantec-reports-first-active-attack-on-a-DSL-router-735883.html
Rename the primary key index when renaming a table in pg

Backport of dcc143cd702bfbfef9cb92e1fde75171d088a5ac

Fixes #12856
Closes #14088
Correct example in the engines testing guide [ci skip]

Reference #17453

Conflicts:
	guides/source/engines.md
Add array support when time zone aware attributes are enabled

Conflicts:
	activerecord/test/cases/adapters/postgresql/array_test.rb
Remove some warnings