Found a small (but important) copy and paste error introduced when I remade the origional patch.  As is session broker sessions can't be properly selected.  The attached patch against head corrects the issue.