Various changes to get ForestDB compiling as part of Sherlock build