little tweaks for using with production VMs
use vif<hostname> instead of vif_<hostname> to save space; f20 can do vifvirtualpanel but not vif_virtualpanel
Merge remote-tracking branch 'upstream/master'