Issue #3312001 by stijndmd, ravi.shankar, davidjguru, longwave, catch: Race condition with automatic deploy steps on ConfigImporter (cherry picked from commit a990872d)