Merge proposals dependent on lp://staging/charms/trusty/rsyslog

lp://staging/charms/trusty/rsyslog has no merge proposals.