Fix licenses in 2020/7/20 master (#3590)