Merge "Update VES Collector schema and properties"