4.0-3549 vs. 4.0-3547 / ogl-lin-mesa / rs2-zfreeze

4.0-3549 (fab35755) Diff 4.0-3547 (85086e1e)
Failure 0f91b2a7f5cd8a4e159aee1664fa89e3af06e040
Failure 6bb1e09deea0d9258acc5c41c71bd3cd46501fa1