PR created at https://github.com/hibernate/hibernate-orm/pull/3166. Feel free to modify it directly. Also fixed a legacy ‘v5.3 and v5.4 missing from drop down list’ issue in this PR.