brianchandotcom/liferay-portal — pull request #20187 by mdelapenya (2014-08-01 11:04:54+00:00)
Title: Pushed to upstream

cc/ @sergiogonzalez @adolfopa @cgoncas @migue. Reverted as portal cannot start properly with original changes, and the fix caused more regressions