tagging B2G_2_1 for mergeday. r=a=mergeday CLOSED TREE DONTBUILD