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