refactoring
change properties
py changes
Merge branch 'develop' of https://pdihub.hi.inet/fiware/fiware-paas into feature/CLAUDIA-SimplyConfigurationProperties

Conflicts:
	automatization_scripts/test_environment_instance_network.py
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/claudia/impl/ClaudiaClientImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/claudia/util/ClaudiaDummyUtilImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/claudia/util/ClaudiaUtil.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/claudia/util/ClaudiaUtilImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/ProductInstallatorRECManagerImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/client/ClientConstants.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/client/RECManagerClient.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/RECACService.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/RECPICService.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/RECServiceService.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/RECVMService.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/RECVirtualServiceService.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/impl/AbstractBaseService.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/impl/RECACServiceImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/impl/RECPICServiceImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/impl/RECServiceServiceImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/impl/RECVMServiceImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/services/impl/RECVirtualServiceServiceImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/util/VappUtils.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/rec/util/VappUtilsImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/manager/async/impl/VirtualServiceAsyncManagerImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/manager/impl/VirtualServiceManagerImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/util/EnvironmentUtils.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/util/EnvironmentUtilsImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/util/OVFUtils.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/util/OVFUtilsDomImpl.java
	core/src/test/java/com/telefonica/euro_iaas/paasmanager/claudia/impl/ClaudiaClientImplTest.java
	core/src/test/java/com/telefonica/euro_iaas/paasmanager/installator/rec/util/VappUtilsImplTest.java
	core/src/test/java/com/telefonica/euro_iaas/paasmanager/manager/ApplicationInstanceManagerImplTest.java
	core/src/test/java/com/telefonica/euro_iaas/paasmanager/util/EnvironmentUtilsImplTest.java
	core/src/test/java/com/telefonica/euro_iaas/paasmanager/util/OVFUtilsDomImplTest.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/EnvironmentInstanceOvfResource.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/EnvironmentInstanceOvfResourceImpl.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/EnvironmentInstanceResourceImpl.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/util/ExtendedOVFUtil.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/util/ExtendedOVFUtilImpl.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/util/OVFGeneration.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/util/OVFGenerationFiwareImpl.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/util/OVFMacro.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/util/OVFMacroImpl.java
	rest-api/src/test/java/com/telefonica/euro_iaas/paasmanager/rest/util/ExtendedOVFUtilImplTest.java
	rest-api/src/test/java/com/telefonica/euro_iaas/paasmanager/rest/util/OVFGenerationFiwareImplTest.java
	rest-api/src/test/java/com/telefonica/euro_iaas/paasmanager/rest/util/OVFMacroImplTest.java
Merge branch 'feature/CLAUDIA-3735-SecurityinSDC' of https://pdihub.hi.inet/fiware/fiware-paas into feature/CLAUDIA-SimplyConfigurationProperties

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/bootstrap/InitDbBootstrap.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/dao/sdc/ProductReleaseSdcDao.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/dao/sdc/impl/ProductReleaseSdcDaoImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/ProductInstallator.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/ProductInstallatorDummySdcImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/ProductInstallatorRECManagerImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/ProductInstallatorSdcImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/sdc/util/SDCDummyUtilImpl.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/sdc/util/SDCUtil.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/installator/sdc/util/SDCUtilImpl.java
	core/src/test/java/com/telefonica/euro_iaas/paasmanager/installator/ProductInstallatorSdcImplTest.java
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/EnvironmentInstanceResourceImpl.java
resolving merges
changes in properties
changes in pom
changes in pom
separation in openstack utils class
dao sdc config change
change in tests
new files for getting default properties from openstack with cache
correct regions, scd utils
model changes
update db sql
Merge branch 'develop' of https://github.com/hmunfru/fiware-paas into feature/CLAUDIA-SimplyConfigurationProperties
anges in logs
resolve the get tenatn id in the get public router and network
load environmetn instance with vdc