Don't declare puppet_version='3' for virt*

Puppet 3 is the default now.

Change-Id: Ia1a2e5bfcf8c67f0f5897c6bd7a26ecf13a77218
Merge "Don't declare puppet_version='3' for virt*" into production