Merge "(bug 34669) Disable CSS concatenation, breaks @import"