Merge "LinkProperties: use ordered comparison for P-CSCFs - only on U+"