Merge branch 'master' into fix-depreation-script

src/checkers/inference/dataflow/InferenceValue.java

@@ -52,7 +52,7 @@ private InferenceAnalysis getInferenceAnalysis() {
      *
      */
     @Override
-    public CFValue leastUpperBound(CFValue other) {
+    public CFValue upperBound(CFValue other, TypeMirror upperBoundTypeMirror, boolean shouldWiden) {
         if (other == null) {
             return this;
         }