Pull request 1745 lps 44378

since Ray is out I'm pushing this review to you... this pull request is what I pulled from https://github.com/hhuijser/liferay-portal/pull/1745