Merge "Fix spelling of controller0_VLANPort"