Merge pull request #17866 from bogdan/default-form-builder

Bugfix config.action_view.default_form_builder option
Fix broken string_ext_test due to change in timezone

- Russian time was changed to UTC+3 from UTC+4 recently. This broke the
  string_to_ext test.
tests, add note about the usage of a specific timezone. Closes #17448.
Merge pull request #17876 from claudiob/fix-tests-on-4-0-stable

Fix tests on 4-0-stable
Merge pull request #17975 from merongivian/add_test_for_search_field

Fix options overwritten by super
Conflicts:
	actionpack/lib/action_view/helpers/tags/text_field.rb
Don't rely on `Time.current` is tests

Millisecond inequality causes failures on Travis
Merge pull request #16011 from xjlu/token_and_options

Improve token_and_options regex and test
Merge pull request #17186 from tgxworld/header_authentication_token

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

Conflicts:
	actionpack/CHANGELOG.md