Merge proposals dependent on lp://qastaging/~mikemc/ubuntuone-client/find-logging-conf

lp://qastaging/~mikemc/ubuntuone-client/find-logging-conf has no merge proposals.