Hardening/68

Not finished due to issue https://github.com/telefonicaid/fiware-connectors/issues/153 has been priorized. Nevertheless, auto-merged since most of the changes are needed in the above issue as well.