Merge "Disable homing_solution"

diff --cc vid-app-common/src/main/java/org/onap/vid/properties/Features.java
Simple merge

diff --cc vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
index dd22dcb,ff542d0..db2ff8e
--- 1/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
--- 2/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
@@@ -32,6 -32,6 +32,7 @@@ FLAG_1810_AAI_LOCAL_CACHE = tru
  FLAG_1902_NEW_VIEW_EDIT= false
  FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
  FLAG_1902_VNF_GROUPING = true
+ FLAG_DISABLE_HOMING = true
  FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH=false
  FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = false
 +FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false