Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Updated Docs describing plugin REST API

Change-Id: Id733286a3a2e9b7d237b33cbee07496e41d69efb