backlog/230 (into develop)

Twin of PR https://github.com/telefonicaid/fiware-connectors/pull/247

DO NOT MERGE YET