Merging changes of master branch
Merging changes of master branch

telefonicaid/iotagent-mqtt,telefonicaid/iotagent-json,telefonicaid/iotagent-mqtt,telefonicaid/iotagent-json,telefonicaid/iotagent-mqtt,telefonicaid/iotagent-json