Add failing tests: test for binding as well as queue, and do the same thing for reset as for forget_cluster_node.
Merge bug26347
stable to default (which is a bit of a rewrite / fiddly merge)