Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: If2f568ab6c574346bc1282e88b514968ff3c6903