Merge "Remove forgotten sahara dbsync from step5 upgrades tasks"