Merge proposals dependent on lp://qastaging/~smoser/cloud-init/syslog-rework

lp://qastaging/~smoser/cloud-init/syslog-rework has no merge proposals.