It's already taken care of in the b2g_dev_force_issuer branch. Rebasing this and pushing.