Fix paths in my previous cp/ChangeLog entries (r206368-r206371) and fix layout in cpp1y PR testcases as pointed out by Jakub.

From-SVN: r206403