Update of JSON files from masterfiles in 3.6 branch.