CFY-1377 upgrade 3.1 - support local images, wait for processes