Fix OSX compile
fix valgrind
Merge branch 'master' of https://github.com/facebook/rocksdb