Merge "Fix PREFIX calculation for attach_interface_to_ovs" into stable/colorado