Merge "Update Heat env file" into amsterdam

diff --combined heat/ONAP/onap_openstack.env
index 00fd2d2,df46e25..95abf97
--- 1/heat/ONAP/onap_openstack.env
--- 2/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -122,7 -122,7 +122,7 @@@ parameters
    policy_branch: amsterdam
    portal_branch: amsterdam
    robot_branch: amsterdam
-   sdc_branch: release-1.1.0
+   sdc_branch: amsterdam
    sdnc_branch: amsterdam
    vid_branch: amsterdam
    clamp_branch: amsterdam
@@@ -137,14 -137,14 +137,14 @@@
    portal_docker: v1.3.0
    robot_docker: 1.1-STAGING-latest
    sdc_docker: v1.1.0
 -  sdnc_docker: v1.2.1
 +  sdnc_docker: v1.2.2
    vid_docker: v1.1.1
    clamp_docker: v1.1.0
    msb_docker: 1.0.0
    mvim_docker: v1.0.0
    uui_docker: v1.0.1
    esr_docker: v1.0.0
 -  dgbuilder_docker: v0.1.0
 +  dgbuilder_docker: v0.1.1
    cli_docker: v1.1.0
  
    vfc_nokia_docker: v1.0.2