Merge changes I355e8244,Iac6ebeca into rvc-dev

* changes:
  Resolve flaky statemachine tests
  MapClientTest reduce FlakyTests