Moved capabilities descriptions for VPNs into VPNCapabilities
Moved capabilities descriptions for MachineImages into MachineImageCapabilities