Merge "Bug 1327 : Fixing a few Connection handling issues" into topic/schema