Merge remote-tracking branch 'origin/1.3' into develop-conflict

# Conflicts:
#	images/elasticsearch/5.2/Dockerfile
#	images/elasticsearch/6.5/Dockerfile
#	images/elasticsearch/6.8/Dockerfile
#	images/elasticsearch/7.11/Dockerfile
#	images/elasticsearch/7.5/Dockerfile
#	images/elasticsearch/7.6/Dockerfile
#	images/elasticsearch/7.7/Dockerfile
#	images/elasticsearch/7.9/Dockerfile
#	images/elasticsearch/es/Dockerfile
#	images/opensearch/1.1/docker-entrypoint.sh

Author: BaDos