Fix find of non-system Boost
Merge cleanups