hhuijser/liferay-portal — pull request #2249 by mtambara (2014-12-19 17:59:41+00:00)
Title: Lps 52298

I know that Brian usually likes smaller pull requests, but since these commits all rely on each other I wasn't quite sure how to split them up.