* stable-2.15:
gerrit.sh: Fix PID definition
AccountIT: Add test for deleting preferred email
AccountIT: Add test coverage of adding an email and setting preferred
Adjust AccountIT#deletePreferredEmail to the different behavior on this
branch: the account is not reindexed twice when the preferred email is
deleted.
Change-Id: Icffba48df458f303f261a2189d3baa942d397fb8