Added state merge-testing to singletons/crowbar/barclamp-cinder/7
Made state merge-testing a child of new in singletons/crowbar/barclamp-cinder/7