Update requirements and address changes in buildbot 4.2.1#574

ambv merged 2 commits intopython:mainpython/buildmaster-config:mainfrom

pablogsal:reqspablogsal/buildmaster-config:reqsCopy head branch name to clipboard