Fixed a bug and cleaned code.  Refs #6968.
Merge branch 'feature/6968_refactor_convert_instrumentfile' into develop