[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2736: Fix some test failures found during RPM package building: