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

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