Changes to PropertyAccessEnhancedImpl were made for HHH-10267 (lazy fetch groups - a feature added for 5.1). My understanding is that those particular changes should be reverted (as they don't account for property access anymore). Also, the current code is not according to what's stated in the javadoc for the class.

Steve Ebersole are you OK with it, or am I missing something here ?!