Merged both BodySearchEnricher and BodyStorageEnricher

Standardising on ContentLength metadata attribute