Merge "Update to final Policy docker"

diff --combined heat/ONAP/onap_openstack.env
index f0f7411,03e95e2..c505690
--- 1/heat/ONAP/onap_openstack.env
--- 2/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -121,8 -121,8 +121,8 @@@ parameters
    policy_branch: master
    portal_branch: release-1.3.0
    robot_branch: master
 -  sdc_branch: release-1.1.0
 -  sdnc_branch: release-1.1.0
 +  sdc_branch: master
 +  sdnc_branch: master
    vid_branch: master
    clamp_branch: master
    vnfsdk_branch: master
@@@ -132,7 -132,7 +132,7 @@@
    appc_docker: 1.1-STAGING-latest
    so_docker: v1.1.0
    dcae_docker: v1.1.0
-   policy_docker: v1.1.0
+   policy_docker: v1.1.1
    portal_docker: v1.3.0
    robot_docker: 1.1-STAGING-latest
    sdc_docker: 1.1-STAGING-latest