Merge "Fix broken docker build due to pip-19.0"