Attempt to fix builds
Merge branch 'es' into 938222
Fix import and method call preventing the build script from succeeding
Unconditional source_repositories initialisation
Merge fix of missing import.