More logging to assist JENKINS-21652 diagnosis