Merge "Add ves-collector configuration"