Merge "Upgrade rust/crates/bstr to 0.2.17"