LPS-35832

Hey Eduardo,

You can throw away the https://github.com/epgarcia/liferay-portal/pull/84 pull since i had to add it on top of this one.

@matethurzo
@KocsisDaniel
@juliocamarero
@JorgeFerrer