EmailAddress table not available in query response

There is an error caused by the code merged for the ticket CO-1861, Code here.

For the ticket CO-1861 which was merged in develop branch there is a fix for the wrong formatting of the user menu. Nevertheless this fix has conflict with the fix proposed and merged if the ticket CO-1840.
In advance the fix proposed in 1861 does not resolve the problem of having a non working Changelog behaviour, user_menu_error.png snapshot below demonstrates this issues. The proposed fix in the ticket 1840 resolves the problem but needs to be extended in order to fetch the email table as well. Also the line code

// Specify fields so we can force the OrgIdentity ID to be distinct

$args['fields'] = array('DISTINCT OrgIdentity.org_identity_id','OrgIdentity.o','OrgIdentity.ou','OrgIdentity.title');

is redundant.

I propose a fix that will be merged in the 3.2.4 hotfix version and will include the EmailAddress table and a fix that will remove the redundant code from the development instance. As soon as the 3.2.4 branch get merged on top of development branch, the whole functionality will be as needed.