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

pr-9497-79cbc7 (79cbc7aa) Diff pr-9497-7b3a28 (7b3a2899)
Failure 22ffa8964f3890059c5ec7430693595b45a60468
Failure a0804158c3179ccddbee7e79e0c55cb20c79846c
Failure 44080ece9e5d2c00f296269cb9338a7d3568ed3c