Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Documentation: Fix plugin testing for standalone and in-tree

Change-Id: I4adeaf5c4ccbe635c6f7cadf2c44c6b75cbd295d