Merge "Move apache HTTP tests out of tests/net"