Fix tests to build with clang on macos
Merge branch 'DependencyUpdate' of https://github.com/NREL/OpenStudio into DependencyUpdate