Merge pull request #15 from apache/abderrahim/cargo-fixes

Multiple fixes to the cargo plugin