Sync oslo cache with oslo-incubator

Due to removal of py3kcompat we need to sync with
oslo-incubator in order to use six package directly.

Related-Bug: #1276440
Change-Id: Ib3d1c9e09497f7ecd7495ef0f70c6105c14a9783
Merge "Sync oslo cache with oslo-incubator"