Merge origin/master into feature/infinispan-full-integ : Correct conflict.
FORUM-666 :[Cluster] Issues with creating and displaying space in tomcat : Revert  commit  disappear in the merge.