Merge "Add device_owner to gateway port search criteria"