Fix for osx default build.
Merge lp:~tangent-org/gearmand/1.2-build/ Build: jenkins-Gearmand-619
Fixes from OSX.
Merge lp:~tangent-org/gearmand/1.2-build/ Build: jenkins-Gearmand-620
Part 1, make more of connection private.
Merge local work from laptop.
Merge lp:~tangent-org/gearmand/1.2-build/ Build: jenkins-Gearmand-621