Modified the ContentValidationListener to check if the request has any upload files present; if so, it will merge that metadata with the incoming parameter data prior to passing that data to the composed input filter.
Ensure files are merged with data prior to validation
Wrote test to validate that when upload files are present, the metadata
is merged with the incoming parameter data prior to validation.
Merge branch 'hotfix/file-uploads'
Merge branch 'hotfix/file-uploads' into develop
Forward port #14