Merge "Increase test stability of backup RBAC tests"