Branch b1_6

b=15069
i=rread
i=wangdi

Skip the "sleep until imp_inflight == 0" part when invalidating an mgc import
which is already invalid.