Merge "(bug 50025) rebuildall.php script needs database admin rights"