Merge "Include tracepath[6] and traceroute6 on debug builds"