Add or update license headers
Merge branch '2.0' into 2.1
Add or update more license headers