merge revision(s) 48934: [Backport #10619]

	* lib/uri/generic.rb (URI::Generic#query=): don't escape [\]^
	  on both rfc2396 and rfc3986. [Bug #10619]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@48950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e