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