Merge "Fix image manifest creation in zuul CI"