DOC-3043 Platform JAVA APIs: Improve English and consistence

DOC-3043 : Improve Javadoc of API-Settings Context
SOC-3385 | Incorrect UI of Attach File - Select/Upload file in intranet home
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ