pr-9497-79cbc7 vs. pr-9497-7b3a28 / ogl-lin-mesa / sms-water

pr-9497-79cbc7 (79cbc7aa) Diff pr-9497-7b3a28 (7b3a2899)
Failure 39035e66415fbaaac1c88f9ad754e22fa9008b3b
Failure 890afe3d5dd8f207d3ac398d7a4f5a882f95db20
Failure ffef7f224a802fa1a19f247045bf68b59ac93f1d