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