Fixed build to handle the 1.6 Dojo format. Fixes #17283.
Merge branch 'master' of https://github.com/mahays0/util