LPS-47565

Hi Matt,

I have tried to reduce commits by fixing all ee-6.2.x SF from you and BC into my previous commits in master, but still got trouble on some fix-ups per the code sequence. So I leave last two SF from you and BC at the last commits. Hopefully you don't feel the commits are heavy. The master has the different code (both Java and JS), so I can't do patch easily and have to manually fix them one by one.

Thanks,
Lin