Fix Oracle Java 7 not being detected correctly on Linux.
Minor cleanup and formatting of messages.