LPS-41678

Julio, can you do an additional review for me. Just want to make sure that this is ok.

For Plugins: https://github.com/juliocamarero/liferay-plugins/pull/93