More changes to support debian packages + alignment with OPM CMake