Yes, if your cgi directory is cgi-local, you upload there. On some servers the vars and cgi are different directories, so if your ultimatebb.cgi is in cgi-local, that is where you upload the cgi-bin folder.
noncgi from the zip goes to your noncgi directory.
You can always check your paths before you upgrade by logging into your CP, and printing the Paths and URLs page.
