Lps 31905

Hi Juan,

changes as suggested by @juliocamarero in https://github.com/juliocamarero/liferay-portal/pull/969#issuecomment-11609201

Each file change has it's own commit in case you wish to use only some of them.