Merge "Added CONF.validation entry security_method"