More logging to assist JENKINS-21163 diagnosis