Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-params

Do not discard query parameters on requests that use wrap_parameters

Conflicts:
	actionpack/CHANGELOG.md

Conflicts:
	actionpack/CHANGELOG.md