Refs #17388.  Backport 0482b557c761cdd96a640123bfb86200f667797c/dijit to 1.9.2.