Merge "Do not canonicalize overlay config test paths"