Move /etc/puppet symlinks back to a normal place on virt0

Change-Id: I2ef88ab7eee10491271e6b9a40db9600c2521522