CON-620 (hopefully) last round of border-radius mixin cleanup