Fix Cargo.lock and add check to ensure the working tree remains clean after build

Fix Cargo.lock and add check to ensure the working tree remains clean after build #7816