Merge "Improve explanation of path conflicts in project config doc" into stable-2.6