(PDB-663) ensure we install the hsqldb dir, and revert curl_with_retries change

Signed-off-by: Ken Barber <ken@bob.sh>