Merge changes I4c3744e0,I91d8de92

* changes:
  c2a: Our cargo works again, re-enable defaulting.
  c2a: Fix rust_version calculation