Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Documentation: Fix plugin testing for standalone and in-tree

Change-Id: I4adeaf5c4ccbe635c6f7cadf2c44c6b75cbd295d
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index c2d0532..6382d72 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -22,7 +22,7 @@
 To execute the tests run:
 
 ```
-  bazel test :@PLUGIN@_tests
+  bazel test //...
 ```
 
 ### Build in Gerrit tree
@@ -56,9 +56,10 @@
   ./tools/eclipse/project.py
 ```
 
-To execute the tests run:
+To execute the tests run either one of:
 
 ```
+  bazel test --test_tag_filters=@PLUGIN@ //...
   bazel test plugins/@PLUGIN@:@PLUGIN@_tests
 ```