Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Documentation: Add missing alternative for plugin in-tree testing
  Upgrade bazlets to latest stable-2.16

Change-Id: I2b44f11c8def5c6bfa1dfa8b789aa0222dbd9cd7