Merge "Refactor ForkExecvp to improve locking behaviour"