Add TACHYON_MASTER_JAVA_OPTS for Master and TACHYON_WORKER_JAVA_OPTS for Worker to the default TACHYON_JAVA_OPTS.
Update comment in the env template file.
Add JAVA_OPTS for Master and Worker for the GlusterFS.
Merge pull request #250 from hsaputra/separate_JAVA_OPTS_for_Master_and_Worker

Add TACHYON_MASTER_JAVA_OPTS for Master and TACHYON_WORKER_JAVA_OPTS
Remove  from  definition in tachyon-glusterfs-env.sh.template because it will be added later.
Merge pull request #251 from hsaputra/remove_JAVA_from_glusterfs_template

Remove $TACHYON_JAVA_OPTS from $JAVA definition in tachyon-glusterfs-env.sh.template file
Merge branch 'master' into journal