LPS-37881 Bugfix
LPS-37881 Added @SupressWarnings
LPS-35256 Fix broken test
Merge branch 'master' of github.com:liferay/liferay-portal