This also fixes support for multiple sources of the same name in different directories. Add a test for both problems. Issue: #19505