HHH-8794 Support for @OrderBy without specifying attribute
HHH-8794 cleanup and formatting