Upgrade six requirement to 1.6.0

This is needed for having URL SplitResult support.

Closes-Bug: #1316328

Change-Id: I8486f8d6e07d577027856a15d60027f24cbe8782
(cherry picked from commit 794915d756c58f4fa8dbd96d6a591a859bec704d)