Fix elasticsearch package and add java7 dependency