Update release notes and fix merge conflict in PR #5365 Signed-off-by: David B. Kinder <david.b.kinder@intel.com>