Merge proposals dependent on lp://qastaging/~niedbalski/charms/precise/rsyslog/fix-1355987

lp://qastaging/~niedbalski/charms/precise/rsyslog/fix-1355987 has no merge proposals.