Add ORCM node diagnostic tool
Merge branch 'master' into odiag