Merge "maintenance: Move backup.inc to a regular php class file"