AMBARI-6635. Fix upgrade to respect -env (aonishuk)

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java

@@ -89,7 +89,7 @@ public class UpgradeCatalog160Test {
     DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
 
     Method m = AbstractUpgradeCatalog.class.getDeclaredMethod
-      ("updateConfigurationProperties", String.class, Map.class, boolean.class);
+      ("updateConfigurationProperties", String.class, Map.class, boolean.class, boolean.class);
 
     UpgradeCatalog160 upgradeCatalog = createMockBuilder(UpgradeCatalog160.class)
       .addMockedMethod(m).createMock();

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java

@@ -124,7 +124,7 @@ public class UpgradeCatalog161Test {
     TypedQuery query = createMock(TypedQuery.class);
 
     Method m = AbstractUpgradeCatalog.class.getDeclaredMethod
-        ("updateConfigurationProperties", String.class, Map.class, boolean.class);
+        ("updateConfigurationProperties", String.class, Map.class, boolean.class, boolean.class);
 
     UpgradeCatalog161 upgradeCatalog = createMockBuilder(UpgradeCatalog161.class)
       .addMockedMethod(m).createMock();