Merge proposals dependent on lp://qastaging/~gnuoy/charms/trusty/neutron-api/add-ssl-support

lp://qastaging/~gnuoy/charms/trusty/neutron-api/add-ssl-support has no merge proposals.