CONN-225: WIP Resolved compilation error and jar conflicts between the last two merged pulls.

...ast two merged pulls.