Fix various "DeprecationWarning, module not renaming, just have __virtual__ return True" messages
Merge pull request #11178 from cro/fix_depwarnings

Fix various '__virtual__ not renamed' DeprecationWarnings