[fixed] CM range - Mantis 3787
[fixed] CM cooldown to not trigger if out of range - Mantis 4216

Change-Id: I204252936800b8aad271a122c082589f3f519495
Merge "[fixed] CM range - Mantis 3787 [fixed] CM cooldown to not trigger if out of range - Mantis 4216" into unstable