FL-1814: FL-1815: stabilize mesa:

needed by gnome-3.14