Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Documentation: Refactor to match other plugin documentation

Change-Id: I365c48252da4d4c88bcbfe20e94e78452fc72a28