Merge "Change https protocol in server.xml"