[CC] Tweak display of migration credentials.

Implements EUCA-5097.
Merge remote-tracking branch 'origin/testing' into dev/juphoff/evac-test