always reorder bind parameters. fixes #15920

Conflicts:
	activerecord/lib/active_record/relation/query_methods.rb
Merge pull request #17145 from mrbrdo/issue15920-4-1

always reorder bind parameters. fixes #15920
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.
Merge pull request #17240 from masarakki/fix-test_helper-of-mountable-plugin

fix test_helper for mountable plugin
Fix regression where router was overwriting PATH_INFO

on cda64c834bb98a2213f57d57efc40afd6ca527ad `path_info` variable already
existed before, so we are overwriting its value.
Add regression test and rename the variable.

[fixes #16926]
[related #17035]
Merge pull request #17233 from arthurnn/fix_regression_on_path_and_cascade

Fix regression where router was overwriting PATH_INFO
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 #17255 from printercu/cors_exception_wrapper

ActionController::InvalidCrossOriginRequest fails with 422 instead of 500
Merge pull request #17313 from accessd/fix-url-generation-error-message

Fix url generation error message
Clarify comments in sanitize_helper.rb

Arguments passed to methods like `sanitized_allowed_tags=` should be Enumerable, so the examples have been wrapped in square brackets to suggest this explicitly.
Merge pull request #17390 from MCGallaspy/issue-17386

Clarify comments in sanitize_helper.rb [ci skip]
Merge pull request #17064 from frenkel/fix_select_tag_include_blank

Use include_blank value as option label
Properly quote numerics when casting string columns

Returning the wrong type can cause the wrong index to be used on some
adapters, or even an error. We use `.try` rather than checking for
`nil`, since the tests on 4.1 imply that objects that do not respond to
`type` can be passed as the column for `quote`.

Closes #17345
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.1.7
Update documentation of touch method

- Note that after_commit and after_rollback callbacks are also run.
- This documentation update is present in master but not in rails-4-1 branch.
- Closes #17438
[ci skip]
Merge pull request #17439 from prathamesh-sonpatki/rails-4-1

Update documentation of touch method
Merge branch '4.1.7' into 4-1-stable

* 4.1.7:
  bumping version to 4.1.7
  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