LPS-44048

Hey @sammso,

Can you please check my changes to epgarcia/liferay-portal/pull/191? They are mainly source formatting. I made sure tests keep passing.

I'm not sure if you discussed with @zsoltbalogh about the backport process, but IMHO this approach is confusing. With your first commits you're pushing to master a code which purpose is only to fix the bug in 6.2.x (actually, those first commits do not compile in master because they were made based on the 6.2.x API). 

What I'd do instead is:

1. Implement the initial basic solution (without model changes) for master and send a PR
2. Once you're changes have been reviewed and merged to master, implement the backport for 6.2.x (i.e., adjusting the approved changes to the 6.2.x API)
3. Finally, and only for master, implement the optimal solution (the one that includes model changes) and send a PR with them.

Thanks!

@juliocamarero