Fix openstack change to include tuple inside function
Remove unused imports
Merge pull request #14961 from rallytime/fix_2014-1

Fix open stack change to include tuple inside function