Update a couple minor style things that were noticed while making previous changes.
Change sun-java6-* packages to their openjdk equivalents and add conditional based on lsb codename to determine which version to install.