Fixes #2198: Drop chunksizes when only when original_shape is different, not when it isn't found#2207

dcherian merged 10 commits intopydata:masterpydata/xarray:masterfrom

Karel-van-de-Plassche:masterKarel-van-de-Plassche/xarray:masterCopy head branch name to clipboard