Merge r957808 from trunk: fix the Futon issue where you have to cancel the admin dialog box after putting back admins that were removed to run the tests