Merge "Fixing nginx provisioning issues for https"