Install java7 when using newest DSE
Merge branch 'dev' into 2.4