Merge "Release notes is updated for error hanndling related to upgrade operation"