Main VMlist modifications. (OMS-340)
Merge pull request #117 from opennode/OMS-340

Main VMlist modifications. (OMS-340)