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