Fix bugs seen by _build/build.php
diagnostics in 5.4
#16399
Merged
_build/build.php
diagnostics in 5.4
#16399