revert unintentional indentation change from [30473], and remove unused dojo/when dependency, refs #13782 !strict