Merge fixes, replaced static in ConnectionManager

Replaced static with singleton-functionality

Remove multi-catch clauses, not compatible with maven 1.5