Merge "Add myself and Jack Bond-Preston as code owners for the CMake build definitions" into integration