Backports minor fixes into 15.9
What does this MR do and why?
Backports minor improvements into the 15.9 stable branch.
MRs:
Related to gitlab-com/gl-infra/delivery#2839 (closed) and gitlab-com/gl-infra/delivery#2841 (closed)
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch. -
The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes). - [-] Ensure the
e2e:package-and-test
job has either succeeded or been approved by a Software Engineer in Test.
Edited by Mayra Cabrera