It's still reproduceable Sanne. I also added a comment to HHH-8788.
I worked around this in my app by not calling query.setLockOptions(LockMode.NONE) ..