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