Buildbot: Always expect buildbot_upload.zip to be in install/ folder

This we we don't have difference between builders on different platforms.

build_files/buildbot/master.cfg

@@ -282,11 +282,6 @@ def generic_builder(id, libdir='', branch='', rsync=False):
                            descriptionDone='packaged'))
     if rsync:
         f.addStep(rsync_step(id, branch, rsync_script))
-    elif id.find('cmake') != -1:
-        f.addStep(FileUpload(name='upload',
-                             slavesrc='buildbot_upload.zip',
-                             masterdest=filename,
-                             maxsize=150 * 1024 * 1024))
     else:
         f.addStep(FileUpload(name='upload',
                              slavesrc='buildbot_upload.zip',

build_files/buildbot/slave_pack.py

@@ -160,7 +160,7 @@ else:
         os.rename(result_file, "{}.zip".format(builderified_name))
         # create zip file
         try:
-            upload_zip = "../buildbot_upload.zip"
+            upload_zip = "../install/buildbot_upload.zip"
             if os.path.exists(upload_zip):
                 os.remove(upload_zip)
             z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)