Merge "Add a test exercising ptrace watchpoint functionality"