Manual builds mixed with scheduled/triggered builds can go over build concurrency limit

Manual triggers use a different lock than other builds, so people can accidentally trigger two builds leading to all sorts of trouble.