Added state new to singletons/crowbar/barclamp-crowbar/693
State machine for singletons/crowbar/barclamp-crowbar/693 reset by dellcloudedge-jenkins
Added state merge-tested to singletons/crowbar/barclamp-nova/227
Made state merge-tested a child of merge-testing in singletons/crowbar/barclamp-nova/227