Merge "Replace docker-py in local buids, too"