fixes issue: #9616 and further optimization of the upgrade:dumpling suites

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>