KFSTI-672 apply Java/resource/web changes