Merge pull request #137 from yasserzamani/WW-5041

WW-5041 adapt to new OGNL security features