Added the option to normalize by current. Refs #9932.
Merge branch 'feature/9932_make_norm_optional' into develop