Squashed 'src/rocksdb2/' content from commit 37c6740

git-subtree-dir: src/rocksdb2
git-subtree-split: 37c6740c383bb9a6ee2747b04f08bc77fcfa10c5
Merge commit '1d38671f5edc2322bc58417816674cc629ae7a70' as 'src/rocksdb2'
Update includes and scons
Remove old rocksdb/