Merge "Revert "Update branches for stable/rocky""