Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/ntp/remove-ntp-status-check

lp://qastaging/~brad-marshall/charms/trusty/ntp/remove-ntp-status-check has no merge proposals.