Pushed to upstream

cc/ @hhuijser. Please review failures here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2251/testReport/com.liferay.portal.tools.sourceformatter/JavaSourceProcessorTest/testIncorrectLineBreaks/