25990 ci web terminal 2 refactored

What does this MR do?

Adds updates to !934 (merged).

Should be merged into !934 (merged)'s branch!

Why was this MR needed?

Cleanups, resolving minor problems mentioned in !934 (merged).

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

Does this MR meet the acceptance criteria?

• Documentation created/updated
• Tests
  • Added for this feature/bug
  • All builds are passing
• Branch has no merge conflicts with master (if you do - rebase it please)

What are the relevant issue numbers?