pr-10904-821ccd vs. 5.0-17027 / ogl-lin-mesa / sms-water

pr-10904-821ccd (821ccd76) Diff 5.0-17027 (1ea0c775)
Failure 9b134c646d08894c19675776bb7d2d0438556c0e
Failure 1c298deafb6c7c365d23d461ae0c3416a28ec980
Failure 659ae59175888c396d68ba40243654760c10adb8