FIX issues raised during code review
FIX issues raised during code review

telefonicaid/fiware-cosmos,telefonicaid/fiware-cosmos,telefonicaid/fiware-cosmos,telefonicaid/fiware-cosmos,telefonicaid/fiware-cosmos