six is now a requirement of many of the oslo-incubator modules

Change-Id: Ibc852817ee1cf3de292551bb8a09a3c15e5d7e29
Merge "six is now a requirement of many of the oslo-incubator modules"