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
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index aa04426..68e848c 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -61,6 +61,13 @@
   bazel-bin/plugins/@PLUGIN@/@PLUGIN@.jar
 ```
 
+To execute the tests run either one of:
+
+```
+  bazel test --test_tag_filters=@PLUGIN@ //...
+  bazel test plugins/@PLUGIN@:@PLUGIN@_tests
+```
+
 This project can be imported into the Eclipse IDE:
 Add the plugin name to the `CUSTOM_PLUGINS` in `tools/bzl/plugins.bzl`, and
 execute:
@@ -69,13 +76,6 @@
   ./tools/eclipse/project.py
 ```
 
-To execute the tests run:
-
-```
-  bazel test plugins/@PLUGIN@:@PLUGIN@_tests
-```
-
-
 [Back to @PLUGIN@ documentation index][index]
 
 [index]: index.html