Merge proposals dependent on lp://qastaging/~ccharles/maria/fix-mariadb-docs

lp://qastaging/~ccharles/maria/fix-mariadb-docs has no merge proposals.