[AC21.4AC21.5] Improve font-lock Java support