Adding users to class when importing csv -refs #6680
some fixes -refs #6680
Indentation
Indentation
Fixing code conventions details -refs #6680
Fixing indentation -refs #6680
Fixing indentation -refs #6680
following function name conventions
coding conventions -refs
Indentation
Indentation
Indentation
Indentation
manual merge
manual merge
Merge branch 'ycastillo-6680' into 1.9.x