Just noticed that Mozilla removed the problimatic language from the #firefox Terms of Use about license grants. The removal happened sometime well after all the noise about the ToU had died down, sometime after May 15th.
My trust in Mozilla as an organization remains at a low eb.
Their faq at https://support.mozilla.org/en-US/kb/firefox-terms-of-use-faq seems to have been updated after that change:
"Previously, we had included some routine licensing language in our Terms of Use that many found confusing. We listened to your feedback, took a second look, and determined the Privacy Notice sufficiently covers the limited permissions we need to operate Firefox on your behalf — so that language has been removed. "
Bless your hearts Mozilla, I was soooo confused by the same transparent legal maneuver that I've seen so many times before.