Pushed to upstream

cc/ @ealonso.  Please see broken test that has been fixed: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/lastCompletedBuild/testReport/com.liferay.portal.kernel.util/TextFormatterTest/testformatStorageSizeOneKB