Merge remote-tracking branch 'upstream/make' into make

# Conflicts:
#	make/tests/integration.rs
#	make/tests/parser.rs

Author: ukrustacean

make/tests/integration.rs

@@ -344,6 +344,7 @@ mod target_behavior {
     use libc::{kill, SIGINT};
     use posixutils_make::parser::parse::ParseError;
     use std::{thread, time::Duration};
+    use super::*;
 
     #[test]
     fn no_targets() {