Again, this was fixed by https://github.com/hibernate/hibernate-orm/pull/1320 which has been applied to upstream master.

Gail, when you decide what to do with this for 5.0/5.1 please resolve/close this.