Hardening/135 (into develop)

Twin of https://github.com/telefonicaid/fiware-connectors/pull/138