Use configured endpoint_type everywhere

It seems there has been some usage forgotten in pollsters.

Change-Id: I19c3b05377d484a7c50cd4534f26405ea67f1232
Merge "Use configured endpoint_type everywhere"