Pushed to upstream

Fixing SF issues.  See: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2764/testReport/com.liferay.portal.tools.sourceformatter/SourceFormatterTest/testSourceFormatter