Set defaults for endpoint_type and service_type

Change-Id: I2fd3c45b3436e876b1f1873fbdb9dc6f77140323