Add keyboard buchet
adjust MCC/MNC pairs (bug 916298)
Make shenanigans more subtle for @krupa

<3
cachebust for new terms (bug 917907)