Added state unit-testing development/master to singletons/crowbar/barclamp-crowbar/367
Made state unit-testing development/master a child of merge-tested in singletons/crowbar/barclamp-crowbar/367