Bug/151 (into release/iotplatform-v1)

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