Bug 1086285 - update licensing information for v2.1.
Merge pull request #25449 from gerv/v2.1

Bug 1086285 - update licensing information for v2.1. r=arthurcc