Merge lp:maria/maria-10.0-galera revisions 3867..3869 and
3871..3879.