Don't leave a status behind for autodelete shovels.
Unused vars
Merge bug26452
stable to default