Reimported Upstream version 1.5.8

The previous import has been made using the pypip tarball which is
slightly different from the one generated by github.  Thus I have
reimported the proper tarball.

Change-Id: I158e452311a27f82d322e78177f2c1468becf130
Merge `upstream` Reimported Upstream version 1.5.8

Change-Id: Ie584bf9575ab1b74afb9de31745ad89e7e94be91