Allow building of Gaudi with local externals. It also contains a fix to an issue introduced with merge request !160 (GAUDI-1212). Fixes GAUDI-1211, GAUDI-1212. See merge request !166