Merge proposals dependent on lp://qastaging/~jjo/charms/trusty/heat/fix-heat_conf-encryption_key-and-auth_uri-lp1368645-lp1368621

lp://qastaging/~jjo/charms/trusty/heat/fix-heat_conf-encryption_key-and-auth_uri-lp1368645-lp1368621 has no merge proposals.