Fixed license header issues found from CI build
Merge master into mango-json