Add newer pmtpa virt nodes to netboot

Change-Id: I938946bf43a17ffa9230126709b7a934cb78cb3a
Add wmflabs.org to wikitech's apache config

Change-Id: Idd0713ddcc90460197bf6a73480057c6f8f41072
Merge "Add wmflabs.org to wikitech's apache config" into production
Merge "Add newer pmtpa virt nodes to netboot" into production