Merge branch 'stable-3.1' * stable-3.1: Documentation: Add plugins part to endpoint URI Change-Id: I945122b7e368676c2ec18825ff6ac89372663f8f