Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index 77b76bc5ea64148ce6a1a74ed49c1d8b3d3cd035,a1b5e54cab8116713745285a49328b831c9c0683..972a6fdf8a91e83129dc20f3c23b404b162e8b9e
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -38,7 -38,6 +38,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -73,7 -72,7 +73,7 @@@ if ($aResult['init-updates']) 
  
      // get the appropriate state id
      $aOutput = 0;
-     exec(CONST_Pyosmium_Get_Changes.' -D '.$sWindBack.' --server '.CONST_Replication_Url,
+     exec(CONST_Pyosmium_Binary.' -D '.$sWindBack.' --server '.CONST_Replication_Url,
          $aOutput, $iRet);
      if ($iRet != 0) {
          fail('Error running pyosmium tools');
@@@ -233,7 -232,7 +233,7 @@@ if ($aResult['import-osmosis'] || $aRes
      }
  
      $sImportFile = CONST_InstallPath.'/osmosischange.osc';
-     $sCMDDownload = CONST_Pyosmium_Get_Changes.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size;
+     $sCMDDownload = CONST_Pyosmium_Binary.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size;
      $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
      $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];