[1.5.x] Updated our six module to follow upstream changes.

This includes fixes for the java/jython detection and a new license header.

Thanks to Thomas Bartelmess for the report.

Backport of c5ce0e8a from master.