Pushed to upstream

cc/ @migue.  Solved junit classpath issue: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2412/console