Update six support in cloud roster
Merge pull request #18675 from techhat/cloudsix

Update six support in cloud roster