Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Merge pull request #20120 from etiennesegonzac/bug-1021533

Bug 1021533 - (bug 1018836 follow up) css class cleanup. r=alive