Partially revert 7ab15103b74a16d774fc0c47ddae5d69e6be5082

"connectivity: use 'application/x-dbase' for DBase files," as it breaks
JunitTest_dbaccess_unoapi.  This apparently needs changes to more places.

Change-Id: I39ce794254324881818951fdb500ff04347b603a
Some Java String clean-up

Change-Id: I6728720a13f4b66edc6c5cd0b7a9bcb036e86ff2