Added state merged to bundles/22ca997310a3b44efff1035ee9cc2e237084b035
Pull request id bundles/22ca997310a3b44efff1035ee9cc2e237084b035 merged upstream.
Added state merge-tested to singletons/crowbar/barclamp-quantum/108
Made state merge-tested a child of merge-testing in singletons/crowbar/barclamp-quantum/108