Pull in cherry-pick in SMW to fix security issue

Change-Id: I27ec15437679da70fa61d529bbb8d90bd440d45b
Merge "Pull in cherry-pick in SMW to fix security issue" into wmf/1.22wmf4