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