Refresh patch so it applies cleanly to lastest leveldb sources.