Merge changes I78bc86ad,Ieeab8376

* changes:
  c2a: Legacy cleanup
  c2a: Parse new cargo output