[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2826: Fixes for two test failures in Buildbot.