Merge pull request #533 from andrerod/dev

Update URLs / names and adding env list
Merge pull request #534 from andrerod/dev

Renames
Fix error when creating VM in Affinity Group
Merge pull request #536 from tomconte/dev

Fix error when creating VM in Affinity Group