Added state merged to singletons/crowbar/barclamp-nova/302
Pull request id singletons/crowbar/barclamp-nova/302 merged upstream.
Added state new to singletons/crowbar/barclamp-cinder/135
State machine for singletons/crowbar/barclamp-cinder/135 reset by dellcloudedge-jenkins
Registered intent to transition singletons/crowbar/barclamp-cinder/135 from new to merge-testing
Added state merge-testing to singletons/crowbar/barclamp-cinder/135
Made state merge-testing a child of new in singletons/crowbar/barclamp-cinder/135