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: I2a6850d0cdf2124d7deabbef577cc163b54b8b48