We landed the first patch for the org guide as it a was
considered a good start, and so we had something concrete
for the Berlin Summit. However there were a few comments
that were unaddressed.
This patch is a follow up to address those comments.
Change-Id: Ibf5f3d8d4f474b65562e8de8c1d6bda459e0f334