Merge proposals dependent on lp:~kwmonroe/charms/trusty/rsyslog-forwarder-ha/testfix

lp:~kwmonroe/charms/trusty/rsyslog-forwarder-ha/testfix has no merge proposals.