KNIFE-291: Adding support for affinity groups and virtual networking