Upgrade lockfile to 0.10.2
Merge pull request #2218 from dstufft/upgrade-lockfile

Upgrade lockfile to 0.10.2
Upgrade CacheControl to 0.10.7