Merge "Combine deleteArchived{Files,Revisions}.inc into the .php scripts"