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