[HEAD MERGE] Connection objects refactor

Signed-off-by: David Goulet <dgoulet@efficios.com>