Fixes for the failing release note tests.
Merge release branch (ours merge, only release notes).

Commit: e22661d6838711ff71693b823d5dd24dcf9c31f8