Merge "Fix for Molecule images build-all.sh"