Repair trunk: cmake version bump had some side-effects in dirty parts of trunktesterbot. See #460