[backport-1.6]: upgrade-from-release-1.5 times out on update-workload-cluster

A solution for issue #3566 (closed) needs to be backported to 1.6.x