Merge branch 'stable-3.1'

* stable-3.1:
  Documentation: Refactor to match other plugin documentation
  Documentation: Add missing alternative for plugin in-tree testing
  Upgrade bazlets to latest stable-2.16

Change-Id: I185f3d1fc5632b1c985d5a5c63c5f2ff346d04a6