Merge proposals dependent on lp://qastaging/~gnuoy/charms/trusty/nova-compute/subctxt-fix

lp://qastaging/~gnuoy/charms/trusty/nova-compute/subctxt-fix has no merge proposals.