Merge pull request #1494 from apache/tristan/refresh-deps

Update requirements and fix resulting problems