#920970 dgit: should ensure .orig is not in the .changes when the .orig is already in DEFERRED