EE: Make sure two except won't overwrite each other
EE for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16010
Also, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15977 is picked here because it's not in EE yet, and this is depending on it, and it has conflicts, too.