#3157
Merge pull request #3195 from dotCMS/issue-3157-bring-changes-for-multitree-into-master

#3157