Rationalise cortex-m-rt and cortex-m versions and update lock files.

Rationalise cortex-m-rt and cortex-m versions and update lock files. #664