Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Documentation: Add plugins part to endpoint URI Change-Id: I412a994f6b250a897df2e33a7b967fc41d0f5cd1