Merge "Add service class for remote_collector in container"