Merge "Collect more debug info from ODL systems"