Merge "PREUPLOAD.cfg: include servicemanager format"