Rename Java options config file

The configuration file name must conform to the corresponding class
name.
Improve java opts doc
Merge branch 'master' into glyn-master