Merge "Add Java property parameters for HTTPS"