Changed java_version_max to java_max_version.

Other tidying and consolidation.
Support java_min_version as alias of java_version.