Merge branch 'master' of https://github.com/telefonicaid/fiware-sdc into develop

Conflicts:
	rest-api/src/main/resources/logback.xml
adding methods for checking the node in the puppet master and that the
recipe has been executed
creatinog of puppet node
change installator with puppet
change times
work towards reviewer commetns
work towards comments
comments
Merge branch 'bug/puppetnodedeploy_63' of https://github.com/telefonicaid/fiware-sdc into bug/frommaster

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/sdc/dao/impl/ChefNodeDaoRestImpl.java
node rest merge
Merge branch 'bug/puppetnodedeploy_63' of https://github.com/telefonicaid/fiware-sdc into bug/frommaster
adding attributes on puppetwrapper call
Merge remote-tracking branch 'upstream/develop' into task/add_puppet_config_attibutes
Adding port as a varibale and the authentication
Removing username and password
backup file is not removed after import
Modifying default database name
refactor and forward attributes from manager to installator
Merge remote-tracking branch 'upstream/develop' into task/add_puppet_config_attibutes
remove unwanted character