Restore defaults.
Fix description.
Fix description.
Fix missing symlinks after broken openjdk-6 upgrade.
Merge branch 'refs/heads/master' into 2.3.x-dev