Catch legacy uses of the iconSize variable when not set by an attribute. Fixes JENKINS-25220.
Merge branch 'master' of https://github.com/jenkinsci/jenkins