Failed to build the apache iceberg master branch.

[openinx]

When I build the latest master branch, I encountered the following error:

> Task :iceberg-mr:compileTestJava
/Users/openinx/software/apache-iceberg/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerWithEngine.java:670: error: method hiveCatalog in class Catalogs cannot be applied to given types;
        executionEngine.equals("mr") && Catalogs.hiveCatalog(shell.getHiveConf()) && fileFormat == FileFormat.ORC);
                                                ^
  required: Configuration,Properties
  found: Configuration
  reason: actual and formal argument lists differ in length
/Users/openinx/software/apache-iceberg/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java:656: error: method hiveCatalog in class Catalogs cannot be applied to given types;
        Catalogs.hiveCatalog(shell.getHiveConf()));
                ^
  required: Configuration,Properties
  found: Configuration
  reason: actual and formal argument lists differ in length
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
2 errors

Looks like this was introduced from this PR (https://github.com/apache/iceberg/pull/2129/files#diff-c183ea3aa154c2a5012f87d7a06dba3cff3f27975384e9fb4040fe6850a98bd6R194).

[rymurr]

FYI @lcspinter @pvary