Merge "Use the networking-l2gw project new location"