[bootstrap,deploy] Fix bootstrap and deployment base servers for (internal) CI builds

Merged André Anjos requested to merge fix-etc-host-avoidance into master

Merge request reports