Fix jdom and remove other osgi warnings. reduces file size and makes better compile time checks
fix scope of database classes and address the checking code glitches
Merge commit 'e79d346fd7776b8a5f05c9bd23edeca39872eb29'