fix for bug 4136: per node consoleondemand backport from 2.9 to 2.8.5