Merge branch 'rs-dev-issue-2419' into 'master'

Allow user to remove public email address

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2419

See merge request !880