brianchandotcom/liferay-portal — pull request #22541 by shuyangzhou (2014-11-28 20:52:20+00:00)
Title: Lps 51891

It should work this time.

@zsoltbalogh for backport, you don't need the last 3 commits.