Forced language links to be capitalized to improve compatibility with future template auto-generation work.
Forced language links to be capitalized to improve compatibility of Base and WET themes with future template auto-generation work. Also fixed merge conflicts.