Merge proposals dependent on lp://qastaging/~evarlast/charms/trusty/elasticsearch/add-version-config

lp://qastaging/~evarlast/charms/trusty/elasticsearch/add-version-config has no merge proposals.