Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Updated Docs describing plugin REST API

Change-Id: I8d419af4eafea3eb5da7f8e990400339ac799e00