sergiogonzalez/liferay-portal — pull request #1215 by izaera (2014-02-11 14:58:52+00:00)
Title: LPS-44098 + LPS-44199 (bonus pack)

Resolution of both LPSs at the same time because they are closely related.

Done in several commits to explain the rationale behind the full change.