Fix/patches for opm2017.10

Merged Bernd Flemisch requested to merge fix/patches-for-opm2017.10 into master

Merge request reports