Merge "Fix docker-ci* build jobs"