Post-merge fix:  Add those files which are new in version 5.1

This is the 5.1 version of the fix for
   Bug #34291  compile-amd64-debug-max-no-ndb missing