Merge "Add a mixed HTTP and HTTPS scenario test"