Merge "Update reno for stable/ocata"