I just rebased my branch: criteria query work on branch wip/6.0, but StatelessSession still does not.
I will have a look at implementing the change in 5.4, or making StatelessSession work in wip/6.0, whatever is simpler.