gopivotal.com -> pivotal.io
Merge branch '2.3.x'