[dev] Broken CI and builds

All - PR #1938 broke Lou's CI system and PR's submitted after this fix will fail Lou's CI. The fix for this was in PR #1947 which has been pushed into the tree. If your PR is failing Lou's CI, I would suggest rebasing and force pushing to get #1947. donald