Pushed to upstream

cc/ @hhuijser.  Please see errors here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2394/testReport/com.liferay.portal.tools.sourceformatter/SourceFormatterTest/testSourceFormatter/