Merge "Update CHANGELOG for Cayuga release" into cayuga