Merge "Remove old packages from rpms/horizon"