Merge "conman:  Add and fix logging."