Fix bugs seen by _build/build.php
diagnostics in 6.0
#16400
Merged
_build/build.php
diagnostics in 6.0
#16400