Merge "Remove duplicate entry in PREUPLOAD.cfg"