[python-urllib3/f21] (5 commits) ...Merge branch 'f21'

[Ralph Bean]

Summary of changes:

  149e0ed... fix license handling (*)
  1960586... Latest upstream to match the latest python-requests. (*)
  f611c7a... Latest upstream.  Re-do unbundling. (*)
  2d10204... Remove dummyserver tests which fail only sometimes. (*)
  8ee9464... Merge branch 'f21'

(*) This commit already existed in another branch; no separate mail sent