Merge branch 'stable-2.15'

* stable-2.15:
  Set Gerrit API snapshot version to 2.15.2-SNAPSHOT
  Fix the error in project properties generation file
  Switch to 2.14.9-SNAPSHOT Gerrit API version for local dev

Change-Id: I8cef9109edc5120332ec6ad136e6adb1fe189efd
diff --git a/tools/sonar/gen_sonar_project_properties.py b/tools/sonar/gen_sonar_project_properties.py
index 266f92a..daf1dda 100755
--- a/tools/sonar/gen_sonar_project_properties.py
+++ b/tools/sonar/gen_sonar_project_properties.py
@@ -85,10 +85,8 @@
   opts = OptionParser()
   opts.add_option('-n', help='plugin name')
   opts.add_option('-c', help='classes directory')
-  opts.add_option('-t', help='test report directory')
   opts.add_option('-o', help='output file', default='sonar-project.properties')
   args, _ = opts.parse_args()
 
   plugin_dir = check_output(['bazel', 'info', 'workspace']).decode('utf-8').strip()
-  generate_project_properties(args.n, plugin_dir, path.abspath(args.c),
-                              path.abspath(args.t), args.o)
+  generate_project_properties(args.n, plugin_dir, path.abspath(args.c), args.o)