Fixed calls to wrong module for new vm discovery.
Merge branch 'test' into dev