microshift: Retry rebase on error and bump deps#8351

vfreex wants to merge 1 commit intoopenshift-eng:openshift-4.21openshift-eng/ocp-build-data:openshift-4.21from

vfreex:microshift-retryvfreex/ocp-build-data:microshift-retryCopy head branch name to clipboard