more fixes: trying to synchronize master with develop
Merge branch 'develop' of https://github.com/jesuspg/fiware-paas into develop

* 'develop' of https://github.com/jesuspg/fiware-paas:
  more fixes: trying to synchronize master with develop

Conflicts:
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/AbstractEnvironmentResourceImpl.java