revert PRT1214-828
Merge branch '6.1.1-ga2-patched' of https://github.com/paulbutenko/liferay-portal into 6.1.1-ga2-patched