Somehow the content has gotten all mixed up, resulting in a very
confusing story. This re-arranges the story to ensure that it follows
a basic sequence that matches the deploy guide and explains the right
things in the right context.
Change-Id: Ia395df90ed1c90aea7c3497d39f5acff9f954bcc