Merge pull request #496 from telefonicaid/bug/493

ReplicaSet support
Merge branch 'release/iotplatform-v1' into hardening/sonar_memory_fixes