Merge "Remove test 048-server-socket"