Profile merge overwrites company affiliation to the old one

[Ilya Shakhat]

The case is following:
1. There is an existing user profile:
   user_id -> company: Uno
   email -> company: Uno
2. At some moment user does contribution from another_email, which is mapped to the profile automatically, becoming a record in the storage:
   another_email -> company: Uno
3. User updates default_data and sets a new company:
  user_id -> company: Uno, Duo
  email -> company: Uno, Duo
(note that another_email is not listed)

The issue occurs when record attributed with another_email is processed. Stackalytics merges profiles, old (see #2) and new (see #3). List of companies is taken from the first, thus overwriting the good profile.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/213754

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/213754
Committed: https://git.openstack.org/cgit/stackforge/stackalytics/commit/?id=09e359b643906692fca5de0c1726d8cf5436ad92
Submitter: Jenkins
Branch: master

commit 09e359b643906692fca5de0c1726d8cf5436ad92
Author: Ilya Shakhat <email address hidden>
Date: Mon Aug 17 18:24:19 2015 +0300

    Fix merge between existing and user-defined user profiles

    Change-Id: I0cfe2421cb8b2a0e87cdb0f3b3b3873edcbd8eb5
    Closes-Bug: #1484180