Merge "Add missing possible errors to ApiRollback.php"