updated buildbot config with CTFMERGE fix