Clean up CMake package finding
Merge branch 'master' into coObjectperf
Fix build on Ubuntu