Merge proposals dependent on lp://staging/~wesmason/charms/trusty/conn-check/add-tests

lp://staging/~wesmason/charms/trusty/conn-check/add-tests has no merge proposals.