CMake rollup

Will get all the patches to the build-scripts from opm-core