Update java to latest to get fix for amazon linux ami
Merge branch 'develop'