Merge remote-tracking branch 'origin/update-from-template-github_com_xdev-software_java-setup-template_master'

Author: AB-xdev