Ingest - Added NON-NLS tag to hardcoded strings not needing National Language Support
Resolved conflicts.
Ingest - Added NON-NLS tags to hardcoded strings not needing National Language Support. Changed were made after resolving merge conflict.
Merge pull request #655 from mrtizmo/ingest

Ingest - Added NON-NLS tag to hardcoded strings not needing...