Merge pull request #2729 from cekstam/add-scale-and-shift-to-modbus