Merge "Changed VF creation to new MSO scaleout API"