Handle legacy use of iconSize as a variable

When iconSize was set as a jelly variable, not passed as an attribute,
the value was not being normalized to an IconSizeClass.  Fixes
JENKINS-25220.