Fixes for new versions of some of the requirements.
Merge pull request #3138 from mkoistinen/more_doc_fixes

Fixes for new versions of some of the requirements.