Backlog/112

Mainly implements issue https://github.com/telefonicaid/fiware-connectors/issues/112.

It implements issue https://github.com/telefonicaid/fiware-connectors/issues/104 as well.
Until I can make IntelliJ checkstyle configuraton work, probably I will introduce more problems... :$

Thanks for the style fixes!

NTC