fixing regression caused by CONTRIB-4865
format lang tags in file name
Merge remote-tracking branch 'upstream/master'