Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Init: Increase severity log level to error on exceptions
  Bazel: Fix genrule2 to clean up temporary folder content
  AbstractIndexTests: Inline constant assertChangeQuery string parameter
  AbstractIndexTests: Align assertChangeQuery method access with its use
  XContentBuilder: Use JsonFactory.builder() and new feature enums

Change-Id: Ieeb295d117830bc1211c2a92dcaa578567c41413

tools/bzl/genrule2.bzl

@@ -21,6 +21,7 @@ def genrule2(cmd, **kwargs):
         "ROOT=$$PWD",
         "TMP=$$(mktemp -d || mktemp -d -t bazel-tmp)",
         "(" + cmd + ")",
+        "rm -rf $$TMP",
     ])
     native.genrule(
         cmd = cmd,