Fix problems that the dashboards turned up.

Change-Id: Ia8cb87472b068adb180547853f038262c4494293
Merge topic 'newest-xdmf' into master

26694e1b Fix problems that the dashboards turned up.