Fix more dijit tests to stop using auto-require, and fix race condition in  !ContentPaneLayout.html causing spurious failures.   Refs #17074.