Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Documentation: Refactor to match other plugin documentation Change-Id: I48a59633d1e9f6040f98b680cc5b7f36612ffdec