Added state build-testing development/openstack-build ubuntu-12.04 to singletons/crowbar/crowbar/1693
Made state build-testing development/openstack-build ubuntu-12.04 a child of merge-tested in singletons/crowbar/crowbar/1693