Merge EE master into ce_upstream

What does this MR do?

Merge EE master into ce_upstream

Are there points in the code the reviewer needs to double check?

I am not sure this how things are done to update ce_upstream when it has conflicts. Feel free to close and and resolve the conflicts another way.

• Will probably need to wait for the DotPosition 👮 fixes to get into EE master before static-analysis passes here, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2211

Why was this MR needed?

Conflicts with ce_upstream and EE master

Does this MR meet the acceptance criteria?

• Tests
  • All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if it does - rebase it please)
• Squashed related commits together

What are the relevant issue numbers?