Fixes docs for release notes
Resolves rebase conflict
Updates es_app_to_dict