Progress with manual merging.

TODO:
 - fix test results are not in Bamboo itself
 - reporting back to FogBugz does not seem to work because of build is
   not a branch build
 - not enough error reporting in general
 - todo's in code