Merge branch 'master' into feature/stabilization-temp
[integ-forum][Migration] Some problems of Forum Activity after migration from PLF 3.5
Merge branch 'feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ