Fix issues raised during code review
Fix issues raised during code review

Fiware/data.Cygnus,Fiware/context.Cygnus,Fiware/context.Cygnus,Fiware/context.Cygnus,Fiware/data.Cygnus,Fiware/data.Cygnus,Fiware/context.Cygnus,telefonicaid/fiware-cygnus,telefonicaid/fiware-cygnus,telefonicaid/fiware-cygnus,telefonicaid/fiware-cygnus