[armedbear-devel] Fixes to trunk for cl-test-grid regressions