Merge proposals dependent on lp://qastaging/~tribaal/charms/trusty/ntp/ntp-add-charmhelper-sync-trick

lp://qastaging/~tribaal/charms/trusty/ntp/ntp-add-charmhelper-sync-trick has no merge proposals.