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 #17221 from StefanH/fix-unknown-http-method-message

Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale.
Conflicts:
	actionpack/lib/action_dispatch/http/request.rb
Don't need to account turbolinks cookies in get request.

It was changed to not set the cookie in get requests at
https://github.com/rails/turbolinks/commit/62cc3db457ad9745ccda047dd43ab84fb3d89707.

Related with dcb05f26.
Merge pull request #17313 from accessd/fix-url-generation-error-message

Fix url generation error message
FileHandler should not be called for files outside the root

FileHandler#matches? should return false for files that are outside the
"root" path.

Conflicts:
	actionpack/lib/action_dispatch/middleware/static.rb
bumping version to 4.0.11
Merge branch '4.0.11' into 4-0-stable

* 4.0.11:
  bumping version to 4.0.11
  FileHandler should not be called for files outside the root
Do not package the guides output

Fixes #17455
Merge branch 'tags-public-send'

Fixes #14180
Fixes #17461
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
	activerecord/lib/active_record/associations/collection_association.rb
	activerecord/test/cases/associations/has_many_associations_test.rb
Make FlashHash#key? work with symbol and string

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

Time includes DateAndTime::Zones acts_like(:time)
Conflicts:
	activesupport/lib/active_support/core_ext/time/zones.rb
correctly escape backslashes in request path globs

make sure that unreadable files are also not leaked

CVE-2014-7829
bumping version for relesase
Merge branch '4-0-sec' into 4-0-stable

* 4-0-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.0.11.1 release
Merge branch '4-0-11-1' into 4-0-stable

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
Sync CHANGELOG
Fix shell quote on the release task