Merge "Set endpoint_type = internal by default for nova requests"