merge revision(s) 42153: [Backport #8645]

	* lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is
	  a relative URI. [Bug #8645]


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