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