Fix issue where we cannot migrate an instance using --source on other
clusters
EUCA-6400
Re-add the NoSuchElementException check but do nothing
EUCA-6400
Merge branch 'dev/chuck/EUCA-6400' into maint/3.3/testing