Merge "fix diagstatus NPE on showSvcStatus CLI"