Skip empty data blocks during fixed VHD upload
Avoid warning about process.nextTick recursive deferral

This warning can actually lead to a crash.
See https://github.com/MSOpenTech/azure-sdk-tools-xplat/issues/80
Fixing merge conflicts
Merge branch 'orangemocha-fixedvhd' into dev