Merge "Update commons-validator to 1.4.1" into stable-2.11