Added state build-testing development/master ubuntu-12.04 to singletons/crowbar/barclamp-crowbar/387
Made state build-testing development/master ubuntu-12.04 a child of merge-tested in singletons/crowbar/barclamp-crowbar/387