Import latest changes from 3.10.0-0xamarin2, to fix F# package installs