Pushed to upstream

cc/ @drewbrokke @rotty3000 @Robert-Frampton. Please review failures here: http://master.liferay.org.es/?css_fast_load=0 -> The CSS is broken when fast load is enabled