MDL-45646 theme_bootstrapbase: More repairing/correcting.