Fix #9204 by outputting extra info on boot file mismatch.

[skip ci] -- testsuite wibbles are in next commit
Testsuite wibbles due to #9204
Update submodule array to fix #9220.