Merge "CORD-3139 Fix M-CORD service graph display"