refs #8794 fixing linkage error caused by Unix-related changes
Merge branch 'feature/8794_unitConversionLimits' into develop