Auto-deploy MR for including the changes from MR#20174

What does this MR do?

Applying Pick into auto-deploy label gives me an error for !20174 (merged), even though I don't see any conflicts in git.

This is a separate MR to overcome the issue.
I just cherry-picked all the commits from the !20174 (merged).

More details: https://gitlab.slack.com/archives/C8HG8D9MY/p1574260929158800

Does this MR meet the acceptance criteria?

Conformity

• [-] Changelog entry
• [-] Documentation (if required)
• Code review guidelines
• Merge request performance guidelines
• Style guides
• [-] Database guides
• [-] Separation of EE specific content