Follow-up from "Draft: Elasticsearch 6.7 is being deprecated with the intention to remove support in GitLab 13.9."

The following discussion from !66128 (merged) should be addressed: