Backport fixes in 99taxis fork

[mvl22]

Backport fixes by @99Taxis in:
https://github.com/99taxis/nominatim-install/commits/master

https://github.com/99taxis/nominatim-install/commit/f7d226b486842506ec3b8a58f3c29dee933433ad
https://github.com/99taxis/nominatim-install/commit/73892d2671ba4d05759c86c836c2125fd7359fad