Refs #5300 Now fix for local branch, pending re-merge.
Refs #5300 Fix warning for unused variable.
Refs #5300 Swap to use double for scaling.