Merge "Modify UDPI artifacts"