Merge "DO NOT MERGE Use correct lock when killing processes" into pi-dev