Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Documentation: Add plugins part to endpoint URI

Change-Id: If56d9030afc9be80dea35454ffa5b6354296f0fd