Bugfix to allow cloud provider extend functionality
Merge pull request #13512 from rallytime/cloud_extends_fix

Bugfix to allow cloud provider extend functionality