Dan raised the comment in the previous patch set that it doesn't make sense to provide two options and four states when there are really only two possibilities; install the jre or the jdk. This change removes the jdk and jre class parameters and replaces them with a single distribution parameters.