Fixing references to fqdn style virt certs

Change-Id: I5c3bb0e7b97a3f3ef613728bd413b87b535a5637
Merge "Fixing references to fqdn style virt certs" into production