Merge "Fixes stale undercloud delorean repos"