Pushed to upstream

cc/ @hhuijser Please see this failure: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2211/testReport/junit/com.liferay.portal.tools.sourceformatter/JavaSourceProcessorTest/testIncorrectLineBreaks/