Merge "update policy-distribution to enable https" into casablanca