Added state unit-testing development/openstack-build to singletons/crowbar/crowbar/1684
Made state unit-testing development/openstack-build a child of merge-tested in singletons/crowbar/crowbar/1684