Merge "Fix volume host schema: host name may not contain '@'"