Added state merge-tested to singletons/crowbar/barclamp-heat/25
Made state merge-tested a child of merge-testing in singletons/crowbar/barclamp-heat/25