s/VMware/GoPivotal/g
Merged bug25538 into stable