Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/bip/update-readme

lp://qastaging/~brad-marshall/charms/trusty/bip/update-readme has no merge proposals.