Merge pull request #2203 from wpaulino/retry-untractable-packages