Merge proposals dependent on lp://staging/~whitmo/charms/trusty/ntp/test-fix

lp://staging/~whitmo/charms/trusty/ntp/test-fix has no merge proposals.