Merge "Enabling generic parser in onap-all override file"