Automatic merge from submit-queue (batch tested with PRs 46635, 45619, 46637, 45059, 46415) fix a comment and log message in the nodecontroller I was poking around in the nodecontroller code and this looked wrong.