Merge proposals dependent on lp://qastaging/~evarlast/charms/trusty/kibana/add-port-path-config

lp://qastaging/~evarlast/charms/trusty/kibana/add-port-path-config has no merge proposals.