[EE] Fix a few disrepencies between CE and EE in the lines ordering

What does this MR do?

EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20937.

Does this MR meet the acceptance criteria?

• Conforms to the code review guidelines
  • Has been reviewed by a Backend maintainer
• EE specific content should be in the top level /ee folder
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• If you have multiple commits, please combine them into a few logically organized commits by squashing them
• End-to-end tests pass (package-and-qa manual pipeline job)