Changed org-name ref to Apigee.com username.
Fixed merge issues.