format 'for update', 'for read only', etc, correctly, and simplify rules#9964

gavinking merged 3 commits intohibernate:mainhibernate/hibernate-orm:mainfrom

gavinking:format-for-updategavinking/hibernate-orm:format-for-updateCopy head branch name to clipboard