5.0-7704 vs. 5.0-7570 / ogl-lin-mesa / sms-water

5.0-7704 (da03ff2e) Diff 5.0-7570 (e67f2dca)
Failure 39035e66415fbaaac1c88f9ad754e22fa9008b3b
Failure 890afe3d5dd8f207d3ac398d7a4f5a882f95db20
Failure 890afe3d5dd8f207d3ac398d7a4f5a882f95db20
Failure ffef7f224a802fa1a19f247045bf68b59ac93f1d