Summary: Replace the existing Java DB bundles with newer ones, and move demo dir into JDK's demo dir as db
Reviewed-by: ohair