Synchronise build system with opm-core to restore build

This change-set synchronises the opm-upscaling build system with that of opm-core to bring in recent improvements and, more importantly, restore the build that failed as a fall-out from the file renaming operation in opm-material (PR OPM/opm-material#11).