These are not very important bugs, so since the changes are important I'm not sure it is worth merging them.
The most important bug is probably #1813839 fixed by rev 20808
Do not highlight php code in phpdoc
20808 (fix bugs #1803310, #3029383, #3316733), also probably fix bug #1813839
20809 (fix bug #2985508)
20810 (fix bug #3151072)
http://jedit.svn.sourceforge.net/jedit/?rev=20808&view=rev
http://jedit.svn.sourceforge.net/jedit/?rev=20809&view=rev
http://jedit.svn.sourceforge.net/jedit/?rev=20810&view=rev
Normally mode fixes don't go into merge requests. I am not sure if I should accept this.
I was also not sure as it changes a lot of things, in that case let's close it.