Fixes build. Closes #5132
... and check for inconsistencies for OS400 at build time with the new chkstrings tool. Closes #4822