Merge pull request #1642 from fonttools/CFF2-fixes

Fixes merge bug when VF source have no blends or no marking glyphs in any charstrings.