bug #3599362 [core] Double-escaped error message
Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
Fix merge conflicts
I don't understand this test (which now fails)