Merge proposals dependent on lp://staging/~brad-marshall/charms/trusty/neutron-api/haproxy-add-timeout

lp://staging/~brad-marshall/charms/trusty/neutron-api/haproxy-add-timeout has no merge proposals.