Really fix on of the issues the dashboards turned up

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

7564b9b8 Really fix on of the issues the dashboards turned up