[backport-1.7]: bootstrap.sh can be stuck on sylva-units preview

A solution for issue #4738 (closed) needs to be backported to 1.7.x