Move a few more things from virt1005 to labnet1001

On pmtpa virt5 is the network host... in eqiad that will
be labnet1001.

Change-Id: I412b1d19f060b3ea57da081cf9844223d4ec17b7
Don't hotpatch the virtdriver for havana.

I may need to reinstate this later but with a havana-specific version.
For the moment I'm just pulling out the folsom-style file to avoid
confusion.

Change-Id: I9a3280dbf382e783f8ec350e3f3bc9bf582c974f