v1.6.99-20210901

[nrf noup] Try to fix conflicting requirements.txt

Some github workflows started to fail on the fork due to
conflicting Python requirements. Apply part of the upstream
patch.