merge fixes for css wro4j compilation