Fixing failing test cases
Merge branch 'bb-10.1-monty' of github.com:MariaDB/server into bb-10.1-monty

Get in Jan's fixes
Fixed more test cases