Merge "Add https service registration support"