Merge branch 'master' into '15-add-muliarch'

# Conflicts:
#   Dockerfile
#   Dockerfile-2.9
#   Dockerfile.ubuntu
#   requirements-2.9.txt
#   requirements.txt
3 jobs for 15-add-muliarch in 8 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
canceled Build image #138598

00:00:08

canceled Build image with ansible 2.9 #138599

00:00:08

canceled Build ubuntu image #138600

00:00:07