Merge "SVNFM codehaus jackson vulnerability fix"