[BISERVER-10656] Build changes
[BISERVER-10656] Dojo CI changes. Do not include in final rebase of this branch