LPS-46853 - Fix wrong LPS number, re-add commits

Brian,

I just realized that I made a typo in my commit: liferay@b2db38648a2ec23b2da8ecbf26e66030a0923771 I meant to write "LPS-46853" instead of "LPS-45853".

To avoid confusions in the future due to the wrong LPS number, I reverted the related commits and re-added them with the correct ticket number.

I needed to revert liferay@731ef381d4319910e220f958955b0082b70d6ea4 asl well, because it touched the body of same method I added in my LPS. The next commit (liferay@9124f7b9aa985db3bb66ef4e802afbb229d6d0ed) after this one in the history is fine, so I didn't not revert that.

I hope it looks good now. (Let me know if it doesn't).

Sorry for the inconveniences,
Tibor