MDL-39871 theme_base: fixing some errors in layout files.