Revert r87542 and rename RELEASE-NOTES to keep them both in trunk and branch