Merge "overlay: Remove obsolete code from pipe config path"