Added state build-testing feature/folsom/openstack-os-build ubuntu-12.04 to singletons/crowbar/barclamp-cinder/7
Made state build-testing feature/folsom/openstack-os-build ubuntu-12.04 a child of merge-tested in singletons/crowbar/barclamp-cinder/7