Merge "Add vendor display name and ID to artifact source properties" into nyc-mr1-dev