Merge pull request #3487 from crosbymichael/improve-images-speed

Only get rootfs when we need to calculate the image size