Merge "Fix gateway condition in sdncresource"