Merge "Move elasticsearch and kibana version to defaults"