Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2' * commit '2a9b411d4ed60acbe089068c93850ecd049f57f2': Turn some logging back on in ConnectionManager