SOS-1411 Fix NPE
Merge branch 'master' of github.com:liferay/liferay-plugins