Merge branch 'master' into 'mewex_to_rancher'

# Conflicts:
#   Dockerfile
2 jobs for mewex_to_rancher in 26 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Check Style
passed #3177
docstyle

00:00:25

passed #3176
pep8

00:00:25