[NC] Remove some debug output.

Fixes EUCA-6092.
Merge remote-tracking branch 'origin/testing' into dev/juphoff/migration