Added state merged to singletons/crowbar/barclamp-nova_dashboard/110
Pull request id singletons/crowbar/barclamp-nova_dashboard/110 merged upstream.
Added state merge-tested to singletons/crowbar/crowbar/1926
Made state merge-tested a child of merge-testing in singletons/crowbar/crowbar/1926