FLUID-5085: Corrected grade merging algorithm

Old "sort and canonicalise" system is gone, together with special status for the defaults type itself. Grades supplied as direct options or through dynamic resolution now correctly take priority over all other grades. This required a small fix to UIOptions where a mixin grade incorrectly displaced material from the FatPanel hierarchy.