Fix yarn.lock issues in stable branches generated by older yarn version.

Open username-removed-636429 requested to merge 10-0-stable-fix-yarn into 10-0-stable

This MR fixes some issues with yarh.lock which was due to a bug in an older version of yarn. These changes were made in master but did not make their way into the stable branches yet.



Edited by username-removed-636429