Merge "Updated the docker version"

diff --combined heat/ONAP/onap_openstack.env
index ef0f43e,da2f934..7da7120
--- 1/heat/ONAP/onap_openstack.env
--- 2/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -130,7 -130,7 +130,7 @@@ parameters
    aai_docker: v1.1.0
    aai_sparky_docker: v1.0.0
    appc_docker: v1.2.0
-   so_docker: v1.1.0
+   so_docker: v1.1.1
    dcae_docker: v1.1.0
    policy_docker: v1.1.1
    portal_docker: v1.3.0
@@@ -146,21 -146,21 +146,21 @@@
    dgbuilder_docker: v0.1.0
    cli_docker: v1.1.0
  
 -  vfc_nokia_docker: 1.0.2-STAGING-latest
 -  vfc_ztevmanagerdriver_docker: 1.0.2-STAGING-latest
 -  vfc_ztesdncdriver_docker: 1.0.0-STAGING-latest
 -  vfc_vnfres_docker: 1.0.1-STAGING-latest
 -  vfc_vnfmgr_docker: 1.0.1-STAGING-latest
 -  vfc_vnflcm_docker: 1.0.1-STAGING-latest
 -  vfc_resmanagement_docker: 1.0.0-STAGING-latest
 -  vfc_nslcm_docker: 1.0.2-STAGING-latest
 -  vfc_huawei_docker: v1.0.0
 -  vfc_jujudriver_docker: 1.0.0-STAGING-latest
 -  vfc_gvnfmdriver_docker: 1.0.1-STAGING-latest
 -  vfc_emsdriver_docker: 1.0.1-STAGING-latest
 -  vfc_catalog_docker: 1.0.2-STAGING-latest
 -  vfc_wfengine_mgrservice_docker: 1.0.0-STAGING-latest
 -  vfc_wfengine_activiti_docker: 1.0.0-STAGING-latest
 +  vfc_nokia_docker: v1.0.2
 +  vfc_ztevmanagerdriver_docker: v1.0.2
 +  vfc_ztesdncdriver_docker: v1.0.0
 +  vfc_vnfres_docker: v1.0.1
 +  vfc_vnfmgr_docker: v1.0.1
 +  vfc_vnflcm_docker: v1.0.1
 +  vfc_resmanagement_docker: v1.0.0
 +  vfc_nslcm_docker: v1.0.2
 +  vfc_huawei_docker: v1.0.2
 +  vfc_jujudriver_docker: v1.0.0
 +  vfc_gvnfmdriver_docker: v1.0.1
 +  vfc_emsdriver_docker: v1.0.1
 +  vfc_catalog_docker: v1.0.2
 +  vfc_wfengine_mgrservice_docker: v1.0.0
 +  vfc_wfengine_activiti_docker: v1.0.0
  
    #####################
    #                   #